From 42c2e6de6d8694b6557cbd7e156c116e6a0eaa5c Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 24 Oct 2012 14:22:37 +0200
Subject: [PATCH] --- yaml --- r: 340925 b: refs/heads/master c:
 5df45690e78fd6355b3eb17ba15a1659e608db5d h: refs/heads/master i:   340923:
 586640a362663a5cc6dc12d34b68af652af5a3f8 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/util.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dacc68266a0a..4c76c78a360e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f87ad637b60a3b789030b3ef969d56a8caec9fed
+refs/heads/master: 5df45690e78fd6355b3eb17ba15a1659e608db5d
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index 51a4a2516233..ea8a6744a9db 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/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;