hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
David Kilroy 2010-04-19 08:16:22 +01:00 committed by John W. Linville
parent c3d415030c
commit 69c264de2a
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wireless/orinoco/main.h
View File

@ -33,18 +33,6 @@ int orinoco_commit(struct orinoco_private *priv);
void orinoco_reset(struct work_struct *work); void orinoco_reset(struct work_struct *work);
/* Information element helpers - find a home for these... */ /* 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_OUI_TYPE "\x00\x50\xF2\x01"
#define WPA_SELECTOR_LEN 4 #define WPA_SELECTOR_LEN 4
static inline u8 *orinoco_get_wpa_ie(u8 *data, size_t len) static inline u8 *orinoco_get_wpa_ie(u8 *data, size_t len)

4
drivers/net/wireless/orinoco/scan.c
View File

@ -126,7 +126,7 @@ void orinoco_add_extscan_result(struct orinoco_private *priv,
{ {
struct wiphy *wiphy = priv_to_wiphy(priv); struct wiphy *wiphy = priv_to_wiphy(priv);
struct ieee80211_channel *channel; struct ieee80211_channel *channel;
u8 *ie; const u8 *ie;
u64 timestamp; u64 timestamp;
s32 signal; s32 signal;
u16 capability; u16 capability;
@ -135,7 +135,7 @@ void orinoco_add_extscan_result(struct orinoco_private *priv,
int chan, freq; int chan, freq;
ie_len = len - sizeof(*bss); 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; chan = ie ? ie[2] : 0;
freq = ieee80211_dsss_chan_to_freq(chan); freq = ieee80211_dsss_chan_to_freq(chan);
channel = ieee80211_get_channel(wiphy, freq); channel = ieee80211_get_channel(wiphy, freq);