git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
include
/
net
/
cfg80211.h
diff --git
a/include/net/cfg80211.h
b/include/net/cfg80211.h
index
8fd9eeb
..
91f0995
100644
(file)
--- a/
include/net/cfg80211.h
+++ b/
include/net/cfg80211.h
@@
-1361,7
+1361,7
@@
enum wiphy_flags {
WIPHY_FLAG_4ADDR_AP = BIT(5),
WIPHY_FLAG_4ADDR_STATION = BIT(6),
WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7),
- WIPHY_FLAG_IBSS_RSN = BIT(
7
),
+ WIPHY_FLAG_IBSS_RSN = BIT(
8
),
};
struct mac_address {