1 files changed, 18 insertions, 7 deletions

diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h
index 184628027213..18fe542360f2 100644
--- a/drivers/net/wireless/wl12xx/wl12xx_80211.h
+++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h
@@ -2,6 +2,7 @@
 #define __WL12XX_80211_H__
 
 #include <linux/if_ether.h>     /* ETH_ALEN */
+#include <linux/if_arp.h>
 
 /* RATES */
 #define IEEE80211_CCK_RATE_1MB                  0x02
@@ -54,7 +55,6 @@
 
 /* This really should be 8, but not for our firmware */
 #define MAX_SUPPORTED_RATES 32
-#define COUNTRY_STRING_LEN 3
 #define MAX_COUNTRY_TRIPLETS 32
 
 /* Headers */
@@ -98,7 +98,7 @@ struct country_triplet {
 
 struct wl12xx_ie_country {
         struct wl12xx_ie_header header;
-        u8 country_string[COUNTRY_STRING_LEN];
+        u8 country_string[IEEE80211_COUNTRY_STRING_LEN];
         struct country_triplet triplets[MAX_COUNTRY_TRIPLETS];
 } __packed;
 
@@ -133,11 +133,17 @@ struct wl12xx_qos_null_data_template {
         __le16 qos_ctl;
 } __packed;
 
-struct wl12xx_probe_req_template {
-        struct ieee80211_header header;
-        struct wl12xx_ie_ssid ssid;
-        struct wl12xx_ie_rates rates;
-        struct wl12xx_ie_rates ext_rates;
+struct wl12xx_arp_rsp_template {
+        struct ieee80211_hdr_3addr hdr;
+
+        u8 llc_hdr[sizeof(rfc1042_header)];
+        __be16 llc_type;
+
+        struct arphdr arp_hdr;
+        u8 sender_hw[ETH_ALEN];
+        __be32 sender_ip;
+        u8 target_hw[ETH_ALEN];
+        __be32 target_ip;
 } __packed;
 
 
@@ -153,4 +159,9 @@ struct wl12xx_probe_resp_template {
         struct wl12xx_ie_country country;
 } __packed;
 
+struct wl12xx_disconn_template {
+        struct ieee80211_header header;
+        __le16 disconn_reason;
+} __packed;
+
 #endif