diff options
| author | David Kilroy <kilroyd@googlemail.com> | 2010-04-19 08:16:22 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-19 16:41:42 -0400 |
| commit | 69c264de2ada18bd9da6c9f582a8babd3dcf5f18 (patch) | |
| tree | 496b1e5bdae3dad863e2d0ef64b972769845c4d7 /drivers | |
| parent | c3d415030c1a00cc21935c38f8761db46ef1d7ff (diff) | |
| download | op-kernel-dev-69c264de2ada18bd9da6c9f582a8babd3dcf5f18.zip op-kernel-dev-69c264de2ada18bd9da6c9f582a8babd3dcf5f18.tar.gz | |
orinoco: use cfg80211_find_ie
Instead of using a local function.
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/orinoco/main.h | 12 | ||||
| -rw-r--r-- | drivers/net/wireless/orinoco/scan.c | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/drivers/net/wireless/orinoco/main.h b/drivers/net/wireless/orinoco/main.h index 21ab36c..4dadf98 100644 --- a/drivers/net/wireless/orinoco/main.h +++ b/drivers/net/wireless/orinoco/main.h @@ -33,18 +33,6 @@ int orinoco_commit(struct orinoco_private *priv); void orinoco_reset(struct work_struct *work); /* Information element helpers - find a home for these... */ -static inline u8 *orinoco_get_ie(u8 *data, size_t len, - enum ieee80211_eid eid) -{ - u8 *p = data; - while ((p + 2) < (data + len)) { - if (p[0] == eid) - return p; - p += p[1] + 2; - } - return NULL; -} - #define WPA_OUI_TYPE "\x00\x50\xF2\x01" #define WPA_SELECTOR_LEN 4 static inline u8 *orinoco_get_wpa_ie(u8 *data, size_t len) diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c index d2f10e9..e97a95b 100644 --- a/drivers/net/wireless/orinoco/scan.c +++ b/drivers/net/wireless/orinoco/scan.c @@ -126,7 +126,7 @@ void orinoco_add_extscan_result(struct orinoco_private *priv, { struct wiphy *wiphy = priv_to_wiphy(priv); struct ieee80211_channel *channel; - u8 *ie; + const u8 *ie; u64 timestamp; s32 signal; u16 capability; @@ -135,7 +135,7 @@ void orinoco_add_extscan_result(struct orinoco_private *priv, int chan, freq; ie_len = len - sizeof(*bss); - ie = orinoco_get_ie(bss->data, ie_len, WLAN_EID_DS_PARAMS); + ie = cfg80211_find_ie(WLAN_EID_DS_PARAMS, bss->data, ie_len); chan = ie ? ie[2] : 0; freq = ieee80211_dsss_chan_to_freq(chan); channel = ieee80211_get_channel(wiphy, freq); |
