diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/cfg80211.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index d17ad5f2b603..815dc3f37e2b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -1745,10 +1745,6 @@ struct cfg80211_ops { | |||
1745 | * hints read the documenation for regulatory_hint_found_beacon() | 1745 | * hints read the documenation for regulatory_hint_found_beacon() |
1746 | * @WIPHY_FLAG_NETNS_OK: if not set, do not allow changing the netns of this | 1746 | * @WIPHY_FLAG_NETNS_OK: if not set, do not allow changing the netns of this |
1747 | * wiphy at all | 1747 | * wiphy at all |
1748 | * @WIPHY_FLAG_ENFORCE_COMBINATIONS: Set this flag to enforce interface | ||
1749 | * combinations for this device. This flag is used for backward | ||
1750 | * compatibility only until all drivers advertise combinations and | ||
1751 | * they will always be enforced. | ||
1752 | * @WIPHY_FLAG_PS_ON_BY_DEFAULT: if set to true, powersave will be enabled | 1748 | * @WIPHY_FLAG_PS_ON_BY_DEFAULT: if set to true, powersave will be enabled |
1753 | * by default -- this flag will be set depending on the kernel's default | 1749 | * by default -- this flag will be set depending on the kernel's default |
1754 | * on wiphy_new(), but can be changed by the driver if it has a good | 1750 | * on wiphy_new(), but can be changed by the driver if it has a good |
@@ -1793,7 +1789,7 @@ enum wiphy_flags { | |||
1793 | WIPHY_FLAG_IBSS_RSN = BIT(8), | 1789 | WIPHY_FLAG_IBSS_RSN = BIT(8), |
1794 | WIPHY_FLAG_MESH_AUTH = BIT(10), | 1790 | WIPHY_FLAG_MESH_AUTH = BIT(10), |
1795 | WIPHY_FLAG_SUPPORTS_SCHED_SCAN = BIT(11), | 1791 | WIPHY_FLAG_SUPPORTS_SCHED_SCAN = BIT(11), |
1796 | WIPHY_FLAG_ENFORCE_COMBINATIONS = BIT(12), | 1792 | /* use hole at 12 */ |
1797 | WIPHY_FLAG_SUPPORTS_FW_ROAM = BIT(13), | 1793 | WIPHY_FLAG_SUPPORTS_FW_ROAM = BIT(13), |
1798 | WIPHY_FLAG_AP_UAPSD = BIT(14), | 1794 | WIPHY_FLAG_AP_UAPSD = BIT(14), |
1799 | WIPHY_FLAG_SUPPORTS_TDLS = BIT(15), | 1795 | WIPHY_FLAG_SUPPORTS_TDLS = BIT(15), |