diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-06-16 13:54:57 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-06-26 16:49:15 -0400 |
commit | ac1044628d477d655f5f70420c3493119abeb6d3 (patch) | |
tree | 121ec41415259d41c497f55f94386762050eb8ca /drivers/net/wireless/rt2x00/rt2x00dev.c | |
parent | e800f17c6ffe8b0410d8cf060ab204b93e9c73ab (diff) |
rt2x00: Use ieee80211 fc handlers
With the introduction of the ieee80211 fc handlers
we can now remove the rt2x00.h versions to use the
global versions.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Reviewed-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index 9ea677320daa..f9e75319770a 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -561,7 +561,6 @@ void rt2x00lib_rxdone(struct queue_entry *entry, | |||
561 | unsigned int align; | 561 | unsigned int align; |
562 | unsigned int i; | 562 | unsigned int i; |
563 | int idx = -1; | 563 | int idx = -1; |
564 | u16 fc; | ||
565 | 564 | ||
566 | /* | 565 | /* |
567 | * The data behind the ieee80211 header must be | 566 | * The data behind the ieee80211 header must be |
@@ -606,8 +605,8 @@ void rt2x00lib_rxdone(struct queue_entry *entry, | |||
606 | * Only update link status if this is a beacon frame carrying our bssid. | 605 | * Only update link status if this is a beacon frame carrying our bssid. |
607 | */ | 606 | */ |
608 | hdr = (struct ieee80211_hdr *)entry->skb->data; | 607 | hdr = (struct ieee80211_hdr *)entry->skb->data; |
609 | fc = le16_to_cpu(hdr->frame_control); | 608 | if (ieee80211_is_beacon(hdr->frame_control) && |
610 | if (is_beacon(fc) && (rxdesc->dev_flags & RXDONE_MY_BSS)) | 609 | (rxdesc->dev_flags & RXDONE_MY_BSS)) |
611 | rt2x00lib_update_link_stats(&rt2x00dev->link, rxdesc->rssi); | 610 | rt2x00lib_update_link_stats(&rt2x00dev->link, rxdesc->rssi); |
612 | 611 | ||
613 | rt2x00dev->link.qual.rx_success++; | 612 | rt2x00dev->link.qual.rx_success++; |