Skip to contentSkip to conversation

cfg80211: enforce lack of interface combinations

PATCH Superseded Johannes Berg 2 participants 9 messages Mar 13, 2012 – Mar 15, 2012 802.11 (including cfg80211/NL80211)

lore
Share & tools
lore

Johannes Berg

author maintainer
#0 lore raw

PATCH 1/1 cfg80211: enforce lack of interface combinations

From: Johannes Berg <[email protected]>

My grand plan to allow drivers to gradually move over to advertising virtual interface combinations and only enforce with drivers that do want it enforced doesn't seem to be working out, only Christian ever added the advertising (to carl9170), nobody else did.

Begin enforcing combinations in cfg80211 so that users can rely on the information reported about a device.

Cc "Luis R. Rodriguez" <[email protected]>
Cc Jouni Malinen <[email protected]>
Cc Vasanthakumar Thiagarajan <[email protected]>
Cc Senthil Balasubramanian <[email protected]>
Cc Kalle Valo <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc Nick Kossifidis <[email protected]>
Cc Bob Copeland <[email protected]>
Cc Bing Zhao <[email protected]>
Cc Lennert Buytenhek <[email protected]>
Cc Ivo van Doorn <[email protected]>
Cc Gertjan van Wingerde <[email protected]>
Cc Helmut Schaa <[email protected]>
Cc Luciano Coelho <[email protected]>
---
 include/net/cfg80211.h |    6 +-----
 net/wireless/core.c    |    4 ----
 net/wireless/util.c    |    7 -------
 3 files changed, 1 insertion(+), 16 deletions(-)
include/net/cfg80211.h +1 -5
@@ -1729,10 +1729,6 @@ struct cfg80211_ops {
  *	hints read the documenation for regulatory_hint_found_beacon()
  * @WIPHY_FLAG_NETNS_OK: if not set, do not allow changing the netns of this
  *	wiphy at all
- * @WIPHY_FLAG_ENFORCE_COMBINATIONS: Set this flag to enforce interface
- *	combinations for this device. This flag is used for backward
- *	compatibility only until all drivers advertise combinations and
- *	they will always be enforced.
  * @WIPHY_FLAG_PS_ON_BY_DEFAULT: if set to true, powersave will be enabled
  *	by default -- this flag will be set depending on the kernel's default
  *	on wiphy_new(), but can be changed by the driver if it has a good
@@ -1777,7 +1773,7 @@ enum wiphy_flags {
 	WIPHY_FLAG_IBSS_RSN			= BIT(8),
 	WIPHY_FLAG_MESH_AUTH			= BIT(10),
 	WIPHY_FLAG_SUPPORTS_SCHED_SCAN		= BIT(11),
-	WIPHY_FLAG_ENFORCE_COMBINATIONS		= BIT(12),
+	/* use hole at 12 */
 	WIPHY_FLAG_SUPPORTS_FW_ROAM		= BIT(13),
 	WIPHY_FLAG_AP_UAPSD			= BIT(14),
 	WIPHY_FLAG_SUPPORTS_TDLS		= BIT(15),
net/wireless/core.c +0 -4
@@ -422,10 +422,6 @@ static int wiphy_verify_combinations(str
 	const struct ieee80211_iface_combination *c;
 	int i, j;
 
-	/* If we have combinations enforce them */
-	if (wiphy->n_iface_combinations)
-		wiphy->flags |= WIPHY_FLAG_ENFORCE_COMBINATIONS;
-
 	for (i = 0; i < wiphy->n_iface_combinations; i++) {
 		u32 cnt = 0;
 		u16 all_iftypes = 0;
net/wireless/util.c +0 -7
@@ -946,13 +946,6 @@ int cfg80211_can_change_interface(struct
 	if (rdev->wiphy.software_iftypes & BIT(iftype))
 		return 0;
 
-	/*
-	 * Drivers will gradually all set this flag, until all
-	 * have it we only enforce for those that set it.
-	 */
-	if (!(rdev->wiphy.flags & WIPHY_FLAG_ENFORCE_COMBINATIONS))
-		return 0;
-
 	memset(num, 0, sizeof(num));
 
 	num[iftype] = 1;
#1 lore raw
Quoted 10 lines · Johannes Berg

From: Johannes Berg <[email protected]>

My grand plan to allow drivers to gradually move over to advertising virtual interface combinations and only enforce with drivers that do want it enforced doesn't seem to be working out, only Christian ever added the advertising (to carl9170), nobody else did.

Begin enforcing combinations in cfg80211 so that users can rely on the information reported about a device.

This breaks ath6kl AP mode and P2P, is it expected that the driver needs to register the combination (?) even it supports a single interface?

Vasanth

author maintainer
#2 lore raw
Quoted 9 lines · Vasanthakumar Thiagarajan
Quoted 8 lines · Johannes Berg

From: Johannes Berg <[email protected]>

My grand plan to allow drivers to gradually move over to advertising virtual interface combinations and only enforce with drivers that do want it enforced doesn't seem to be working out, only Christian ever added the advertising (to carl9170), nobody else did.

Quoted 6 lines
Quoted 2 lines

Begin enforcing combinations in cfg80211 so that users can rely on the information reported about a device.

This breaks ath6kl AP mode and P2P, is it expected that the driver needs to register the combination (?) even it supports a single interface?

Kalle tells me that ath6kl does support multiple virtual interfaces, but if it didn't then it wouldn't have to register combinations.

I suspect you're using
driver_param=use_p2p_group_interface=1
in wpa_supplicant?

johannes

#3 lore raw
Quoted 17 lines · Johannes Berg
Quoted 9 lines · Vasanthakumar Thiagarajan
Quoted 8 lines · Johannes Berg

From: Johannes Berg <[email protected]>

My grand plan to allow drivers to gradually move over to advertising virtual interface combinations and only enforce with drivers that do want it enforced doesn't seem to be working out, only Christian ever added the advertising (to carl9170), nobody else did.

Quoted 6 lines
Quoted 2 lines

Begin enforcing combinations in cfg80211 so that users can rely on the information reported about a device.

This breaks ath6kl AP mode and P2P, is it expected that the driver needs to register the combination (?) even it supports a single interface?

Quoted 6 lines

Kalle tells me that ath6kl does support multiple virtual interfaces, but if it didn't then it wouldn't have to register combinations.

I suspect you're using
driver_param=use_p2p_group_interface=1
in wpa_supplicant?

Actually, I verified only AP mode, since it affects any sort of change interface, I mentioned P2P as well. AP is expected to work without any issue right?.

Vasanth

author maintainer
#4 lore raw
Quoted 21 lines · Vasanthakumar Thiagarajan
Quoted 20 lines · Johannes Berg
Quoted 9 lines · Vasanthakumar Thiagarajan
Quoted 8 lines · Johannes Berg

From: Johannes Berg <[email protected]>

My grand plan to allow drivers to gradually move over to advertising virtual interface combinations and only enforce with drivers that do want it enforced doesn't seem to be working out, only Christian ever added the advertising (to carl9170), nobody else did.

Quoted 6 lines
Quoted 2 lines

Begin enforcing combinations in cfg80211 so that users can rely on the information reported about a device.

This breaks ath6kl AP mode and P2P, is it expected that the driver needs to register the combination (?) even it supports a single interface?

Kalle tells me that ath6kl does support multiple virtual interfaces, but if it didn't then it wouldn't have to register combinations.

Quoted 6 lines
Quoted 3 lines

I suspect you're using
driver_param=use_p2p_group_interface=1
in wpa_supplicant?

Actually, I verified only AP mode, since it affects any sort of change interface, I mentioned P2P as well. AP is expected to work without any issue right?.

As long as you don't try to add the AP interface as the second one...

johannes

#5 lore raw
Quoted 22 lines · Johannes Berg
Quoted 21 lines · Vasanthakumar Thiagarajan
Quoted 20 lines · Johannes Berg
Quoted 9 lines · Vasanthakumar Thiagarajan
Quoted 8 lines · Johannes Berg

From: Johannes Berg <[email protected]>

My grand plan to allow drivers to gradually move over to advertising virtual interface combinations and only enforce with drivers that do want it enforced doesn't seem to be working out, only Christian ever added the advertising (to carl9170), nobody else did.

Quoted 6 lines
Quoted 2 lines

Begin enforcing combinations in cfg80211 so that users can rely on the information reported about a device.

This breaks ath6kl AP mode and P2P, is it expected that the driver needs to register the combination (?) even it supports a single interface?

Kalle tells me that ath6kl does support multiple virtual interfaces, but if it didn't then it wouldn't have to register combinations.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

I suspect you're using
driver_param=use_p2p_group_interface=1
in wpa_supplicant?

Actually, I verified only AP mode, since it affects any sort of change interface, I mentioned P2P as well. AP is expected to work without any issue right?.

As long as you don't try to add the AP interface as the second one...

Right, I'm trying on a single interface.

Vasanth

author maintainer
#6 lore raw
Quoted 27 lines · Vasanthakumar Thiagarajan
Quoted 26 lines · Johannes Berg
Quoted 25 lines · Vasanthakumar Thiagarajan
Quoted 23 lines · Johannes Berg
Quoted 9 lines · Vasanthakumar Thiagarajan
Quoted 8 lines · Johannes Berg

From: Johannes Berg <[email protected]>

My grand plan to allow drivers to gradually move over to advertising virtual interface combinations and only enforce with drivers that do want it enforced doesn't seem to be working out, only Christian ever added the advertising (to carl9170), nobody else did.

Quoted 6 lines
Quoted 2 lines

Begin enforcing combinations in cfg80211 so that users can rely on the information reported about a device.

This breaks ath6kl AP mode and P2P, is it expected that the driver needs to register the combination (?) even it supports a single interface?

Kalle tells me that ath6kl does support multiple virtual interfaces, but if it didn't then it wouldn't have to register combinations.

I suspect you're using
driver_param=use_p2p_group_interface=1
in wpa_supplicant?

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

Actually, I verified only AP mode, since it affects any sort of change interface, I mentioned P2P as well. AP is expected to work without any issue right?.

As long as you don't try to add the AP interface as the second one...

Right, I'm trying on a single interface.

Hmm, ok, looking at the code again it seems there's a bug ... let me try to fix it.

johannes

#7 lore raw
Quoted 31 lines · Johannes Berg
Quoted 30 lines · Vasanthakumar Thiagarajan
Quoted 29 lines · Johannes Berg
Quoted 27 lines · Vasanthakumar Thiagarajan
Quoted 17 lines · Johannes Berg
Quoted 9 lines · Vasanthakumar Thiagarajan
Quoted 8 lines · Johannes Berg

From: Johannes Berg <[email protected]>

My grand plan to allow drivers to gradually move over to advertising virtual interface combinations and only enforce with drivers that do want it enforced doesn't seem to be working out, only Christian ever added the advertising (to carl9170), nobody else did.

Quoted 6 lines
Quoted 2 lines

Begin enforcing combinations in cfg80211 so that users can rely on the information reported about a device.

This breaks ath6kl AP mode and P2P, is it expected that the driver needs to register the combination (?) even it supports a single interface?

Quoted 6 lines

Kalle tells me that ath6kl does support multiple virtual interfaces, but if it didn't then it wouldn't have to register combinations.

I suspect you're using
driver_param=use_p2p_group_interface=1
in wpa_supplicant?

Actually, I verified only AP mode, since it affects any sort of change interface, I mentioned P2P as well. AP is expected to work without any issue right?.

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

As long as you don't try to add the AP interface as the second one...

Right, I'm trying on a single interface.

Hmm, ok, looking at the code again it seems there's a bug ... let me try to fix it.

V2 fixes this, thanks!.

Vasanth

author maintainer
#8 lore raw

PATCH v2 1/1 cfg80211: enforce lack of interface combinations

In reply to Johannes Berg

From: Johannes Berg <[email protected]>

My grand plan to allow drivers to gradually move over to advertising virtual interface combinations and only enforce with drivers that do want it enforced doesn't seem to be working out, only Christian ever added the advertising (to carl9170), nobody else did.

Begin enforcing combinations in cfg80211 so that users can rely on the information reported about a device.

Cc "Luis R. Rodriguez" <[email protected]>
Cc Jouni Malinen <[email protected]>
Cc Vasanthakumar Thiagarajan <[email protected]>
Cc Senthil Balasubramanian <[email protected]>
Cc Kalle Valo <[email protected]>
Cc Jiri Slaby <[email protected]>
Cc Nick Kossifidis <[email protected]>
Cc Bob Copeland <[email protected]>
Cc Bing Zhao <[email protected]>
Cc Lennert Buytenhek <[email protected]>
Cc Ivo van Doorn <[email protected]>
Cc Gertjan van Wingerde <[email protected]>
Cc Helmut Schaa <[email protected]>
Cc Luciano Coelho <[email protected]>
---
 include/net/cfg80211.h |    6 +-----
 net/wireless/core.c    |    4 ----
 net/wireless/util.c    |   10 +++-------
 3 files changed, 4 insertions(+), 16 deletions(-)
include/net/cfg80211.h +1 -5
@@ -1729,10 +1729,6 @@ struct cfg80211_ops {
  *	hints read the documenation for regulatory_hint_found_beacon()
  * @WIPHY_FLAG_NETNS_OK: if not set, do not allow changing the netns of this
  *	wiphy at all
- * @WIPHY_FLAG_ENFORCE_COMBINATIONS: Set this flag to enforce interface
- *	combinations for this device. This flag is used for backward
- *	compatibility only until all drivers advertise combinations and
- *	they will always be enforced.
  * @WIPHY_FLAG_PS_ON_BY_DEFAULT: if set to true, powersave will be enabled
  *	by default -- this flag will be set depending on the kernel's default
  *	on wiphy_new(), but can be changed by the driver if it has a good
@@ -1777,7 +1773,7 @@ enum wiphy_flags {
 	WIPHY_FLAG_IBSS_RSN			= BIT(8),
 	WIPHY_FLAG_MESH_AUTH			= BIT(10),
 	WIPHY_FLAG_SUPPORTS_SCHED_SCAN		= BIT(11),
-	WIPHY_FLAG_ENFORCE_COMBINATIONS		= BIT(12),
+	/* use hole at 12 */
 	WIPHY_FLAG_SUPPORTS_FW_ROAM		= BIT(13),
 	WIPHY_FLAG_AP_UAPSD			= BIT(14),
 	WIPHY_FLAG_SUPPORTS_TDLS		= BIT(15),
net/wireless/core.c +0 -4
@@ -422,10 +422,6 @@ static int wiphy_verify_combinations(str
 	const struct ieee80211_iface_combination *c;
 	int i, j;
 
-	/* If we have combinations enforce them */
-	if (wiphy->n_iface_combinations)
-		wiphy->flags |= WIPHY_FLAG_ENFORCE_COMBINATIONS;
-
 	for (i = 0; i < wiphy->n_iface_combinations; i++) {
 		u32 cnt = 0;
 		u16 all_iftypes = 0;
net/wireless/util.c +3 -7
@@ -946,13 +946,6 @@ int cfg80211_can_change_interface(struct
 	if (rdev->wiphy.software_iftypes & BIT(iftype))
 		return 0;
 
-	/*
-	 * Drivers will gradually all set this flag, until all
-	 * have it we only enforce for those that set it.
-	 */
-	if (!(rdev->wiphy.flags & WIPHY_FLAG_ENFORCE_COMBINATIONS))
-		return 0;
-
 	memset(num, 0, sizeof(num));
 
 	num[iftype] = 1;
@@ -972,6 +965,9 @@ int cfg80211_can_change_interface(struct
 	}
 	mutex_unlock(&rdev->devlist_mtx);
 
+	if (total == 1)
+		return 0;
+
 	for (i = 0; i < rdev->wiphy.n_iface_combinations; i++) {
 		const struct ieee80211_iface_combination *c;
 		struct ieee80211_iface_limit *limits;