diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2011-08-11 15:07:16 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-22 14:45:58 -0400 |
| commit | 5d852905561a979dfb4d8a68f7313dcb8f055bec (patch) | |
| tree | f0d88c585de7e886aba645f63c0a1dad08d38690 /drivers/net/wireless/b43/xmit.c | |
| parent | efe0249b0fd1e9a32a7e6a5dc9c751d4d97b0adf (diff) | |
| download | blackbird-op-linux-5d852905561a979dfb4d8a68f7313dcb8f055bec.tar.gz blackbird-op-linux-5d852905561a979dfb4d8a68f7313dcb8f055bec.zip | |
b43: support new TX header, noticed to be used by 598.314+ fw
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/xmit.c')
| -rw-r--r-- | drivers/net/wireless/b43/xmit.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 5ce17d5eed6e..b02170d6614a 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c @@ -338,6 +338,10 @@ int b43_generate_txhdr(struct b43_wldev *dev, } } switch (dev->fw.hdr_format) { + case B43_FW_HDR_598: + b43_generate_plcp_hdr((struct b43_plcp_hdr4 *)(&txhdr->format_598.plcp), + plcp_fragment_len, rate); + break; case B43_FW_HDR_351: b43_generate_plcp_hdr((struct b43_plcp_hdr4 *)(&txhdr->format_351.plcp), plcp_fragment_len, rate); @@ -435,6 +439,10 @@ int b43_generate_txhdr(struct b43_wldev *dev, struct ieee80211_cts *uninitialized_var(cts); switch (dev->fw.hdr_format) { + case B43_FW_HDR_598: + cts = (struct ieee80211_cts *) + (txhdr->format_598.rts_frame); + break; case B43_FW_HDR_351: cts = (struct ieee80211_cts *) (txhdr->format_351.rts_frame); @@ -453,6 +461,10 @@ int b43_generate_txhdr(struct b43_wldev *dev, struct ieee80211_rts *uninitialized_var(rts); switch (dev->fw.hdr_format) { + case B43_FW_HDR_598: + rts = (struct ieee80211_rts *) + (txhdr->format_598.rts_frame); + break; case B43_FW_HDR_351: rts = (struct ieee80211_rts *) (txhdr->format_351.rts_frame); @@ -472,6 +484,9 @@ int b43_generate_txhdr(struct b43_wldev *dev, /* Generate the PLCP headers for the RTS/CTS frame */ switch (dev->fw.hdr_format) { + case B43_FW_HDR_598: + plcp = &txhdr->format_598.rts_plcp; + break; case B43_FW_HDR_351: plcp = &txhdr->format_351.rts_plcp; break; @@ -486,6 +501,10 @@ int b43_generate_txhdr(struct b43_wldev *dev, len, rts_rate_fb); switch (dev->fw.hdr_format) { + case B43_FW_HDR_598: + hdr = (struct ieee80211_hdr *) + (&txhdr->format_598.rts_frame); + break; case B43_FW_HDR_351: hdr = (struct ieee80211_hdr *) (&txhdr->format_351.rts_frame); @@ -522,6 +541,9 @@ int b43_generate_txhdr(struct b43_wldev *dev, /* Magic cookie */ switch (dev->fw.hdr_format) { + case B43_FW_HDR_598: + txhdr->format_598.cookie = cpu_to_le16(cookie); + break; case B43_FW_HDR_351: txhdr->format_351.cookie = cpu_to_le16(cookie); break; |
