diff options
author | Ivo van Doorn <ivdoorn@gmail.com> | 2010-08-06 14:49:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 15:26:43 -0400 |
commit | e5ef5bad345f97f1fef7ccdc01a88c298629a5d9 (patch) | |
tree | c8bd82d0d4eabf9d71d765992b970df67486d857 /drivers/net/wireless/rt2x00/rt2x00.h | |
parent | 0856d9c04a1655612abd96793c1e8b1c1792457e (diff) |
rt2x00: Remove ieee80211_rx_status from rt2x00_dev
rt2x00 was keeping a copy of ieee80211_rx_status embedded
into the rt2x00_dev structure. For each RX frame, this structure
was copied into the skb->cb where mac80211 would handle it further.
However at the moment only the fields current band, and frequency
were updated. Whereas the band was already provided directly within
the rt2x00_dev structure. Save a memcpy action, and reduce memory
a bit, by adding a curr_freq field to rt2x00_dev, and completely
remove the ieee80211_rx_status structure from rt2x00_dev.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index edfc2b759282..8c65244a847a 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
@@ -699,6 +699,7 @@ struct rt2x00_dev { | |||
699 | struct ieee80211_hw *hw; | 699 | struct ieee80211_hw *hw; |
700 | struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS]; | 700 | struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS]; |
701 | enum ieee80211_band curr_band; | 701 | enum ieee80211_band curr_band; |
702 | int curr_freq; | ||
702 | 703 | ||
703 | /* | 704 | /* |
704 | * If enabled, the debugfs interface structures | 705 | * If enabled, the debugfs interface structures |
@@ -851,11 +852,6 @@ struct rt2x00_dev { | |||
851 | struct ieee80211_low_level_stats low_level_stats; | 852 | struct ieee80211_low_level_stats low_level_stats; |
852 | 853 | ||
853 | /* | 854 | /* |
854 | * RX configuration information. | ||
855 | */ | ||
856 | struct ieee80211_rx_status rx_status; | ||
857 | |||
858 | /* | ||
859 | * Scheduled work. | 855 | * Scheduled work. |
860 | * NOTE: intf_work will use ieee80211_iterate_active_interfaces() | 856 | * NOTE: intf_work will use ieee80211_iterate_active_interfaces() |
861 | * which means it cannot be placed on the hw->workqueue | 857 | * which means it cannot be placed on the hw->workqueue |