[PATCH IGNORE AT YOUR PERIL] cfg80211: force interface combinations to be advertised

[PATCH IGNORE AT YOUR PERIL] cfg80211: force interface combinations to be advertised

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

So my "sunset" period idea didn't work, nobody
worked on getting interface combinations added.
Almost 4 months after introducing this flag, no
drivers have been changed to advertise their
interface combinations. Force them now if they
want to keep multiple virtual interfaces.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
I told you this would happen :-)

 include/net/cfg80211.h |    5 -----
 net/wireless/core.c    |    4 ----
 net/wireless/util.c    |    7 -------
 3 files changed, 16 deletions(-)

--- a/include/net/cfg80211.h	2011-09-07 18:16:22.000000000 +0200
+++ b/include/net/cfg80211.h	2011-09-07 18:16:27.000000000 +0200
@@ -1601,10 +1601,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
@@ -1632,7 +1628,6 @@ 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),
 };
 
 /**
--- a/net/wireless/core.c	2011-09-07 18:14:10.000000000 +0200
+++ b/net/wireless/core.c	2011-09-07 18:16:16.000000000 +0200
@@ -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;
--- a/net/wireless/util.c	2011-09-07 18:14:56.000000000 +0200
+++ b/net/wireless/util.c	2011-09-07 18:16:08.000000000 +0200
@@ -948,13 +948,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;

Re: [PATCH IGNORE AT YOUR PERIL] cfg80211: force interface combinations to be advertised

[Christian Lamparter]

On Wednesday, September 07, 2011 06:21:52 PM Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> So my "sunset" period idea didn't work, nobody
> worked on getting interface combinations added.
> Almost 4 months after introducing this flag, no
> drivers have been changed to advertise their
> interface combinations. Force them now if they
> want to keep multiple virtual interfaces.

no drivers? I thought I added the necessary bits
in carl9170 shortly after the interface combinations
patches were accepted?

commit df64962f7d74877624442c059e7878fdf7ec3c22
Author: Christian Lamparter <chunkeey@googlemail.com>
Date:   Sat May 14 02:42:38 2011 +0200

    carl9170: advertise interface combinations

Did I miss something there?

Regards,
	Chr

Re: [PATCH IGNORE AT YOUR PERIL] cfg80211: force interface combinations to be advertised

[Johannes Berg]

On Wed, 2011-09-07 at 18:32 +0200, Christian Lamparter wrote:

> no drivers? I thought I added the necessary bits
> in carl9170 shortly after the interface combinations
> patches were accepted?
> 
> commit df64962f7d74877624442c059e7878fdf7ec3c22
> Author: Christian Lamparter <chunkeey@googlemail.com>
> Date:   Sat May 14 02:42:38 2011 +0200
> 
>     carl9170: advertise interface combinations
> 
> Did I miss something there?

No, sorry, I just forgot, my mistake!

However, you were the only one, thanks for that!

johannes

Re: [PATCH IGNORE AT YOUR PERIL] cfg80211: force interface combinations to be advertised

[Johannes Berg]

Actually, I'll retract this patch.

I'm working on actually making use of this information in wpa_s, at
which point everybody will want it anyway, or so I hope ;-)

johannes