diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
| commit | 24912420e923d56461b400d83f250a31bed8a964 (patch) | |
| tree | 3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 /include/net/cfg80211.h | |
| parent | 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 (diff) | |
| parent | 0302b8622ce696af1cda22fcf207d3793350e896 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
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 e5702f5ac57..772dea243e5 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -1356,7 +1356,7 @@ enum wiphy_flags { | |||
| 1356 | WIPHY_FLAG_4ADDR_AP = BIT(5), | 1356 | WIPHY_FLAG_4ADDR_AP = BIT(5), |
| 1357 | WIPHY_FLAG_4ADDR_STATION = BIT(6), | 1357 | WIPHY_FLAG_4ADDR_STATION = BIT(6), |
| 1358 | WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7), | 1358 | WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7), |
| 1359 | WIPHY_FLAG_IBSS_RSN = BIT(7), | 1359 | WIPHY_FLAG_IBSS_RSN = BIT(8), |
| 1360 | }; | 1360 | }; |
| 1361 | 1361 | ||
| 1362 | struct mac_address { | 1362 | struct mac_address { |