diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-11-24 22:19:24 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-11-24 22:19:24 +0100 |
| commit | d7a066c92394f3e777351de0c903beeb8a08af76 (patch) | |
| tree | f54ce8ac77d32b4c3166b4a2ca92525174a3213b /include/net/cfg80211.h | |
| parent | Revert "nl80211/mac80211: Report signal average" (diff) | |
| parent | wireless: b43: fix error path in SDIO (diff) | |
| download | linux-d7a066c92394f3e777351de0c903beeb8a08af76.tar.xz linux-d7a066c92394f3e777351de0c903beeb8a08af76.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/net/cfg80211.h')
| -rw-r--r-- | include/net/cfg80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 8fd9eebd0cc9..91f099556ac1 100644 --- 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 { |