at76_usb: convert to use linux/ieee80211.h
PATCH 1/1 at76_usb: convert to use linux/ieee80211.h
Jason Andryuk noticed that at76_usb won't compile with current wireless-testing tree. This is because net/ieee80211.h was missing.
net/ieee80211.h will be removed soon and at76_usb won't compile then that happens. Preprare for that by using instead linux/ieee80211.h and copying some structures not available.
---
drivers/staging/at76_usb/at76_usb.c | 18 ++++--- drivers/staging/at76_usb/at76_usb.h | 87 +++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 9 deletions(-)
drivers/staging/at76_usb/at76_usb.c +9 -9
@@ -36,7 +36,7 @@#include <net/ieee80211_radiotap.h> #include <linux/firmware.h> #include <linux/leds.h> -#include <net/ieee80211.h> +#include <linux/ieee80211.h> #include "at76_usb.h"
@@ -1727,12 +1727,12 @@ static int at76_assoc_req(struct at76_priv *priv, struct bss_info *bss)/* write TLV data elements */ - ie->id =MFIE_TYPE_SSID ; + ie->id =WLAN_EID_SSID ; ie->len = bss->ssid_len;memcpy (ie->data, bss->ssid, bss->ssid_len);next_ie (&ie); - ie->id =MFIE_TYPE_RATES ; + ie->id =WLAN_EID_SUPP_RATES ; ie->len =sizeof (hw_rates);memcpy (ie->data, hw_rates,sizeof (hw_rates));next_ie (&ie);/* ie points behind the supp_rates field */
@@ -4397,7 +4397,7 @@ static void at76_rx_mgmt_beacon(struct at76_priv *priv,switch (ie->id) { -case MFIE_TYPE_SSID : +case WLAN_EID_SSID :if (have_ssid)break ;
@@ -4420,7 +4420,7 @@ static void at76_rx_mgmt_beacon(struct at76_priv *priv, have_ssid =1 ;break ; -case MFIE_TYPE_RATES : +case WLAN_EID_SUPP_RATES :if (have_rates)break ;
@@ -4433,7 +4433,7 @@ static void at76_rx_mgmt_beacon(struct at76_priv *priv, hex2str(ie->data, ie->len));break ; -case MFIE_TYPE_DS_SET : +case WLAN_EID_DS_PARAMS :if (have_channel)break ;
@@ -4443,9 +4443,9 @@ static void at76_rx_mgmt_beacon(struct at76_priv *priv, priv->netdev->name, match->channel);break ; -case MFIE_TYPE_CF_SET : -case MFIE_TYPE_TIM : -case MFIE_TYPE_IBSS_SET : +case WLAN_EID_CF_PARAMS : +case WLAN_EID_TIM : +case WLAN_EID_IBSS_PARAMS :default : at76_dbg(DBG_RX_BEACON, "%s: beacon IE id %d len %d %s", priv->netdev->name, ie->id, ie->len,
drivers/staging/at76_usb/at76_usb.h +87 -0
93 lines not on this page · raw message
Quoted 8 lines · Kalle Valo
Jason Andryuk noticed that
at76_usbwon't compile with current wireless-testing tree. This is becausenet/ieee80211.hwas missing.
net/ieee80211.hwill be removed soon andat76_usbwon't compile then that happens. Preprare for that by using insteadlinux/ieee80211.hand copying some structures not available.Signed-off-by Kalle Valo <[email protected]>
Ping? This is still an issue in git head... Should probably go in via the staging tree...
regards, Kyle
Quoted 4 lines · Kyle McMartin
Quoted 3 lines · Kalle Valo
Jason Andryuk noticed that
at76_usbwon't compile with current wireless-testing tree. This is becausenet/ieee80211.hwas missing.
Quoted 8 lines
Quoted 5 lines
net/ieee80211.hwill be removed soon andat76_usbwon't compile then that happens. Preprare for that by using insteadlinux/ieee80211.hand copying some structures not available.Signed-off-by Kalle Valo <[email protected]>Ping? This is still an issue in git head... Should probably go in via the staging tree...
At least the patch is in Greg's staging directory:
I would assume that Greg pushes it forward at some point.
Signature · 1 line
Kalle Valo
Quoted 6 lines · Kalle Valo
At least the patch is in Greg's staging directory:
I would assume that Greg pushes it forward at some point.
Ah, apologies. I forgot Greg uses that quilt tree and didn't find it merged when I looked.
regards, Kyle