From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "John W. Linville" <linville@tuxdriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Eric Dumazet <eric.dumazet@gmail•com>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, Kiran Divekar <dkiran@marvell•com>,
Amitkumar Karwar <akarwar@marvell•com>
Subject: linux-next: manual merge of the wireless tree with the net tree
Date: Wed, 23 Jun 2010 12:51:38 +1000 [thread overview]
Message-ID: <20100623125138.dff6c368.sfr@canb.auug.org.au> (raw)
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/libertas/host.h between commit
ba2d3587912f82d1ab4367975b1df460db60fb1e ("drivers/net: use __packed
annotation") from the net tree and commit
c2af450168af531b70564e3ceb20983199a66216 ("Libertas: Added 11d support
using cfg80211") from the wireless tree.
Just a white space change clashing with a real change! I fixed it up
(and changed some newly added "__attribute__ ((packed))" to "__packed" as
well ...) (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/net/wireless/libertas/host.h
index 3bd5d3b,112fbf1..0000000
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@@ -387,8 -387,32 +387,32 @@@ struct enc_key
struct lbs_offset_value {
u32 offset;
u32 value;
-} __attribute__ ((packed));
+} __packed;
+ #define MRVDRV_MAX_TRIPLET_802_11D 83
+
+ #define COUNTRY_CODE_LEN 3
+
+ struct mrvl_ie_domain_param_set {
+ struct mrvl_ie_header header;
+
+ u8 countrycode[COUNTRY_CODE_LEN];
+ struct ieee80211_country_ie_triplet triplet[1];
-} __attribute__ ((packed));
++} __packed;
+
+ struct cmd_ds_802_11d_domain_info {
+ __le16 action;
+ struct mrvl_ie_domain_param_set domain;
-} __attribute__ ((packed));
++} __packed;
+
+ struct lbs_802_11d_domain_reg {
+ /** Country code*/
+ u8 country_code[COUNTRY_CODE_LEN];
+ /** No. of triplet*/
+ u8 no_triplet;
+ struct ieee80211_country_ie_triplet triplet[MRVDRV_MAX_TRIPLET_802_11D];
-} __attribute__ ((packed));
++} __packed;
+
/*
* Define data structure for CMD_GET_HW_SPEC
* This structure defines the response for the GET_HW_SPEC command
next reply other threads:[~2010-06-23 2:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-23 2:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-19 0:59 linux-next: manual merge of the wireless tree with the net tree Stephen Rothwell
2011-08-19 1:03 ` John W. Linville
2011-06-23 2:47 Stephen Rothwell
2011-05-19 1:02 Stephen Rothwell
2010-07-21 2:04 Stephen Rothwell
2010-07-09 1:51 Stephen Rothwell
2010-07-09 9:59 ` Luciano Coelho
2010-06-04 1:48 Stephen Rothwell
2010-06-04 6:14 ` Luciano Coelho
2010-04-12 4:05 Stephen Rothwell
2010-02-16 1:01 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100623125138.dff6c368.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akarwar@marvell$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dkiran@marvell$(echo .)com \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox