diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 17:18:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 17:18:09 -0400 |
| commit | 3f968de276a8e585deb182d4ba56013a479c80bc (patch) | |
| tree | bff8932bb5e64c22708aad48a6edbef3a707a774 /net/wireless/scan.c | |
| parent | 5ca1b998d33c39819fca2b675d80c4469e705f2d (diff) | |
| parent | d0bec34293bb0b8dddc26d25bd46a6631d6b3ec3 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 7043de6221ab..19c5a9a8d085 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
| @@ -141,7 +141,7 @@ void cfg80211_bss_expire(struct cfg80211_registered_device *dev) | |||
| 141 | dev->bss_generation++; | 141 | dev->bss_generation++; |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | static u8 *find_ie(u8 num, u8 *ies, size_t len) | 144 | static u8 *find_ie(u8 num, u8 *ies, int len) |
| 145 | { | 145 | { |
| 146 | while (len > 2 && ies[0] != num) { | 146 | while (len > 2 && ies[0] != num) { |
| 147 | len -= ies[1] + 2; | 147 | len -= ies[1] + 2; |