From: David S. Miller <davem@davemloft.net>
Date: Fri, 2 Jul 2010 00:34:14 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.36-rc1~571^2~385
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=05318bc905467237d4aa68a701f6e92a2b332218;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
	drivers/net/wireless/libertas/host.h
---

05318bc905467237d4aa68a701f6e92a2b332218
diff --cc drivers/net/wireless/libertas/host.h
index 3bd5d3b,112fbf1..db8e209
--- 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));
+ 
+ struct cmd_ds_802_11d_domain_info {
+ 	__le16 action;
+ 	struct mrvl_ie_domain_param_set domain;
+ } __attribute__ ((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));
+ 
  /*
   * Define data structure for CMD_GET_HW_SPEC
   * This structure defines the response for the GET_HW_SPEC command
@@@ -957,6 -984,5 +984,5 @@@ struct cmd_ds_command 
  		struct cmd_ds_fwt_access fwt;
  		struct cmd_ds_802_11_beacon_control bcn_ctrl;
  	} params;
 -} __attribute__ ((packed));
 +} __packed;
- 
  #endif