diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-18 14:56:09 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-18 14:56:09 -0500 |
| commit | 07bfa524d4c67acbb6b6fbdd1dea923d07853c04 (patch) | |
| tree | 6e3819f13d3f4efa9c099cf227b1d42b1bc78620 /include | |
| parent | 93908d192686d8285dd6441ff855df92a40103d2 (diff) | |
| parent | 3bf30b56c4f0a1c4fae34050b7db4527c92891e8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
| -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 { | |||
| 1355 | WIPHY_FLAG_4ADDR_AP = BIT(5), | 1355 | WIPHY_FLAG_4ADDR_AP = BIT(5), |
| 1356 | WIPHY_FLAG_4ADDR_STATION = BIT(6), | 1356 | WIPHY_FLAG_4ADDR_STATION = BIT(6), |
| 1357 | WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7), | 1357 | WIPHY_FLAG_CONTROL_PORT_PROTOCOL = BIT(7), |
| 1358 | WIPHY_FLAG_IBSS_RSN = BIT(7), | 1358 | WIPHY_FLAG_IBSS_RSN = BIT(8), |
| 1359 | }; | 1359 | }; |
| 1360 | 1360 | ||
| 1361 | struct mac_address { | 1361 | struct mac_address { |