diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-18 20:56:09 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-18 20:56:09 +0100 |
| commit | 07bfa524d4c67acbb6b6fbdd1dea923d07853c04 (patch) | |
| tree | 6e3819f13d3f4efa9c099cf227b1d42b1bc78620 /include/net | |
| parent | ipv6: Expose IFLA_PROTINFO timer values in msecs instead of jiffies (diff) | |
| parent | ath9k_htc: Avoid setting QoS control for non-QoS frames (diff) | |
| download | linux-07bfa524d4c67acbb6b6fbdd1dea923d07853c04.tar.xz linux-07bfa524d4c67acbb6b6fbdd1dea923d07853c04.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/net')
| -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 2a7936d7851d..97b8b7c9b63c 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1355,7 +1355,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 { |