diff options
| author | Frederic Leroy <fredo@starox.org> | 2010-02-17 23:25:26 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-19 20:52:41 (GMT) |
| commit | e2117cea27c6b27e1a379acac5eb0433eeb7033a (patch) | |
| tree | 36371bf349577840c6fa796bca671c12316e68f1 /drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c | |
| parent | 5b9a919a97ac8bdda8020c9b366491b5b91b196e (diff) | |
| download | linux-fsl-qoriq-e2117cea27c6b27e1a379acac5eb0433eeb7033a.tar.xz | |
staging: rtl8192su: fix compile error from wireless-testing commit
In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr
to include/linux/ieee80211.h. This definition collides with one that is
in the rtl8192su driver in staging.
The conflict is resolved by changing rtl8192su
to use the definition from include/linux/ieee80211.h.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c')
| -rw-r--r-- | drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c index 8d12ffc..c696245 100644 --- a/drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c @@ -136,7 +136,7 @@ static struct sk_buff* ieee80211_ADDBA(struct ieee80211_device* ieee, u8* Dst, P memcpy(BAReq->addr3, ieee->current_network.bssid, ETH_ALEN); - BAReq->frame_ctl = cpu_to_le16(IEEE80211_STYPE_MANAGE_ACT); //action frame + BAReq->frame_control = cpu_to_le16(IEEE80211_STYPE_MANAGE_ACT); //action frame //tag += sizeof( struct ieee80211_hdr_3addr); //move to action field tag = (u8*)skb_put(skb, 9); @@ -221,7 +221,7 @@ static struct sk_buff* ieee80211_DELBA( memcpy(Delba->addr1, dst, ETH_ALEN); memcpy(Delba->addr2, ieee->dev->dev_addr, ETH_ALEN); memcpy(Delba->addr3, ieee->current_network.bssid, ETH_ALEN); - Delba->frame_ctl = cpu_to_le16(IEEE80211_STYPE_MANAGE_ACT); //action frame + Delba->frame_control = cpu_to_le16(IEEE80211_STYPE_MANAGE_ACT); //action frame tag = (u8*)skb_put(skb, 6); |