Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327627
b: refs/heads/master
c: e217689
h: refs/heads/master
i:
  327625: 61d4227
  327623: 7a8ec77
v: v3
  • Loading branch information
Vladimir Kondratiev authored and Johannes Berg committed Jul 31, 2012
1 parent e097586 commit 5db0bb2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8c7d857c4a4a552d8d3e1b2e24e1864ec2989285
refs/heads/master: e21768928d73df55e648869d3ae159475d1e4b7d
18 changes: 3 additions & 15 deletions trunk/net/wireless/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -684,22 +684,10 @@ EXPORT_SYMBOL(cfg80211_classify8021d);

const u8 *ieee80211_bss_get_ie(struct cfg80211_bss *bss, u8 ie)
{
u8 *end, *pos;

pos = bss->information_elements;
if (pos == NULL)
if (bss->information_elements == NULL)
return NULL;
end = pos + bss->len_information_elements;

while (pos + 1 < end) {
if (pos + 2 + pos[1] > end)
break;
if (pos[0] == ie)
return pos;
pos += 2 + pos[1];
}

return NULL;
return cfg80211_find_ie(ie, bss->information_elements,
bss->len_information_elements);
}
EXPORT_SYMBOL(ieee80211_bss_get_ie);

Expand Down

0 comments on commit 5db0bb2

Please sign in to comment.