diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-29 14:52:04 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 14:52:04 -0400 |
| commit | d1f10302568221c20628200bc8baa426c55f61c0 (patch) | |
| tree | 5eeb95d847924ec587e5e9a47ea2d2275d37635f /net/mac80211/util.c | |
| parent | 9b34f40c20111ba658f88e1669598db494be1fbc (diff) | |
| parent | 1724ffbc7439de679d536163e03f54f35574d449 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 60c8ad10deb1..b3a84746d445 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
| @@ -821,7 +821,7 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len, | |||
| 821 | if (elem_parse_failed) | 821 | if (elem_parse_failed) |
| 822 | elems->parse_error = true; | 822 | elems->parse_error = true; |
| 823 | else | 823 | else |
| 824 | set_bit(id, seen_elems); | 824 | __set_bit(id, seen_elems); |
| 825 | 825 | ||
| 826 | left -= elen; | 826 | left -= elen; |
| 827 | pos += elen; | 827 | pos += elen; |