Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

b43legacy: use frame control helpers

Browse source 
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Harvey Harrison 2008-06-14 23:33:40 -07:00 committed by John W. Linville
parent f37d923422
commit b99a017c01
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/net/wireless/b43legacy/xmit.c
View file

@ -442,7 +442,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
struct b43legacy_plcp_hdr6 *plcp; struct b43legacy_plcp_hdr6 *plcp;
struct ieee80211_hdr *wlhdr; struct ieee80211_hdr *wlhdr;
const struct b43legacy_rxhdr_fw3 *rxhdr = _rxhdr; const struct b43legacy_rxhdr_fw3 *rxhdr = _rxhdr;
u16 fctl; __le16 fctl;
u16 phystat0; u16 phystat0;
u16 phystat3; u16 phystat3;
u16 chanstat; u16 chanstat;
@ -480,7 +480,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
goto drop; goto drop;
} }
wlhdr = (struct ieee80211_hdr *)(skb->data); wlhdr = (struct ieee80211_hdr *)(skb->data);
fctl = le16_to_cpu(wlhdr->frame_control); fctl = wlhdr->frame_control;
if ((macstat & B43legacy_RX_MAC_DEC) && if ((macstat & B43legacy_RX_MAC_DEC) &&
!(macstat & B43legacy_RX_MAC_DECERR)) { !(macstat & B43legacy_RX_MAC_DECERR)) {
@ -499,11 +499,11 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
if (dev->key[keyidx].algorithm != B43legacy_SEC_ALGO_NONE) { if (dev->key[keyidx].algorithm != B43legacy_SEC_ALGO_NONE) {
/* Remove PROTECTED flag to mark it as decrypted. */ /* Remove PROTECTED flag to mark it as decrypted. */
B43legacy_WARN_ON(!(fctl & IEEE80211_FCTL_PROTECTED)); B43legacy_WARN_ON(!ieee80211_has_protected(fctl));
fctl &= ~IEEE80211_FCTL_PROTECTED; fctl &= ~cpu_to_le16(IEEE80211_FCTL_PROTECTED);
wlhdr->frame_control = cpu_to_le16(fctl); wlhdr->frame_control = fctl;
wlhdr_len = ieee80211_get_hdrlen(fctl); wlhdr_len = ieee80211_hdrlen(fctl);
if (unlikely(skb->len < (wlhdr_len + 3))) { if (unlikely(skb->len < (wlhdr_len + 3))) {
b43legacydbg(dev->wl, "RX: Packet size" b43legacydbg(dev->wl, "RX: Packet size"
" underrun3\n"); " underrun3\n");
@ -556,9 +556,7 @@ void b43legacy_rx(struct b43legacy_wldev *dev,
* of timestamp, i.e. about 65 milliseconds after the PHY received * of timestamp, i.e. about 65 milliseconds after the PHY received
* the first symbol. * the first symbol.
*/ */
if (((fctl & (IEEE80211_FCTL_FTYPE | IEEE80211_FCTL_STYPE)) if (ieee80211_is_beacon(fctl) || dev->wl->radiotap_enabled) {
== (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_BEACON)) ||
dev->wl->radiotap_enabled) {
u16 low_mactime_now; u16 low_mactime_now;
b43legacy_tsf_read(dev, &status.mactime); b43legacy_tsf_read(dev, &status.mactime);