diff options
author | Michal Kazior <michal.kazior@tieto.com> | 2012-04-11 02:47:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-13 14:32:50 -0400 |
commit | 4ee73f338a528f44fd90496adfbfd9c119401850 (patch) | |
tree | 665c02d2ec013a09b252713c8f94b604f6050cc7 /net/mac80211/ieee80211_i.h | |
parent | f58cc809d2fe60989095c7b55fd14e1935a2f72a (diff) |
mac80211: remove hw.conf.channel usage where possible
Removes hw.conf.channel usage from the following functions:
* ieee80211_mandatory_rates
* ieee80211_sta_get_rates
* ieee80211_frame_duration
* ieee80211_rts_duration
* ieee80211_ctstoself_duration
This is in preparation for multi-channel operation.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 1fd8cb26b3ff..8cc4bc101409 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -1404,7 +1404,7 @@ static inline int __ieee80211_resume(struct ieee80211_hw *hw) | |||
1404 | extern void *mac80211_wiphy_privid; /* for wiphy privid */ | 1404 | extern void *mac80211_wiphy_privid; /* for wiphy privid */ |
1405 | u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len, | 1405 | u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len, |
1406 | enum nl80211_iftype type); | 1406 | enum nl80211_iftype type); |
1407 | int ieee80211_frame_duration(struct ieee80211_local *local, size_t len, | 1407 | int ieee80211_frame_duration(enum ieee80211_band band, size_t len, |
1408 | int rate, int erp, int short_preamble); | 1408 | int rate, int erp, int short_preamble); |
1409 | void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx, | 1409 | void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx, |
1410 | struct ieee80211_hdr *hdr, const u8 *tsc, | 1410 | struct ieee80211_hdr *hdr, const u8 *tsc, |