Skip to content

Commit

Permalink
orinoco: use cfg80211_find_ie
Browse files Browse the repository at this point in the history
Instead of using a local function.

Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
David Kilroy authored and John W. Linville committed Apr 19, 2010
1 parent c3d4150 commit 69c264d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
12 changes: 0 additions & 12 deletions drivers/net/wireless/orinoco/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/orinoco/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit 69c264d

Please sign in to comment.