linux-kernel - linux-next: manual merge of the wireless tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20100623125138.dff6c368.sfr@canb.auug.org.au>
Date:	Wed, 23 Jun 2010 12:51:38 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Eric Dumazet <eric.dumazet@...il.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Kiran Divekar <dkiran@...vell.com>,
	Amitkumar Karwar <akarwar@...vell.com>
Subject: linux-next: manual merge of the wireless tree with the net tree

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@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/