diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-23 22:23:00 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-23 22:23:00 +0100 |
| commit | 427749861d74bc1a6f9e5dc523cf0ea2e42e8eed (patch) | |
| tree | 0fb30928ad6ee5bba95d94818bc1fa3ea6f7730b /drivers/net/wireless/wl12xx/rx.c | |
| parent | Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | wl12xx: AP-mode - management of links in PS-mode (diff) | |
| download | linux-427749861d74bc1a6f9e5dc523cf0ea2e42e8eed.tar.xz linux-427749861d74bc1a6f9e5dc523cf0ea2e42e8eed.zip | |
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'drivers/net/wireless/wl12xx/rx.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/rx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/wl12xx/rx.c index 00d250d8da18..3d13d7a83ea1 100644 --- a/drivers/net/wireless/wl12xx/rx.c +++ b/drivers/net/wireless/wl12xx/rx.c @@ -92,7 +92,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length) { struct wl1271_rx_descriptor *desc; struct sk_buff *skb; - u16 *fc; + struct ieee80211_hdr *hdr; u8 *buf; u8 beacon = 0; @@ -118,8 +118,8 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length) /* now we pull the descriptor out of the buffer */ skb_pull(skb, sizeof(*desc)); - fc = (u16 *)skb->data; - if ((*fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_BEACON) + hdr = (struct ieee80211_hdr *)skb->data; + if (ieee80211_is_beacon(hdr->frame_control)) beacon = 1; wl1271_rx_status(wl, desc, IEEE80211_SKB_RXCB(skb), beacon); |