aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/util.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-10-29 14:52:04 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-10-29 14:52:04 -0400
commitd1f10302568221c20628200bc8baa426c55f61c0 (patch)
tree5eeb95d847924ec587e5e9a47ea2d2275d37635f /net/mac80211/util.c
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (diff)
parentmac80211: complete bss_info tracing (diff)
downloadlinux-dev-d1f10302568221c20628200bc8baa426c55f61c0.tar.xz
linux-dev-d1f10302568221c20628200bc8baa426c55f61c0.zip
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.c2
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,
if (elem_parse_failed)
elems->parse_error = true;
else
- set_bit(id, seen_elems);
+ __set_bit(id, seen_elems);
left -= elen;
pos += elen;