Skip to contentSkip to conversation

rt2x00: error in configurations with mesh support disabled

PATCH In review Felix Fietkau 3 participants 5 messages Feb 26, 2013 – Feb 27, 2013 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rt2x00: error in configurations with mesh support disabled

If CONFIG_MAC80211_MESH is not set, cfg80211 will now allow advertising interface combinations with NL80211_IFTYPE_MESH_POINT present. Add appropriate ifdefs to avoid running into errors.

---
 drivers/net/wireless/rt2x00/rt2x00dev.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/rt2x00/rt2x00dev.c +6 -2
index 1031db6..189744d 100644
@@ -1236,8 +1236,10 @@ static inline void rt2x00lib_set_if_combinations(struct rt2x00_dev *rt2x00dev)
 	 */
 	if_limit = &rt2x00dev->if_limits_ap;
 	if_limit->max = rt2x00dev->ops->max_ap_intf;
-	if_limit->types = BIT(NL80211_IFTYPE_AP) |
-			BIT(NL80211_IFTYPE_MESH_POINT);
+	if_limit->types = BIT(NL80211_IFTYPE_AP);
+#ifdef CONFIG_MAC80211_MESH
+	if_limit->types |= BIT(NL80211_IFTYPE_MESH_POINT);
+#endif
 
 	/*
 	 * Build up AP interface combinations structure.
@@ -1309,7 +1311,9 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
 		rt2x00dev->hw->wiphy->interface_modes |=
 		    BIT(NL80211_IFTYPE_ADHOC) |
 		    BIT(NL80211_IFTYPE_AP) |
+#ifdef CONFIG_MAC80211_MESH
 		    BIT(NL80211_IFTYPE_MESH_POINT) |
+#endif
 		    BIT(NL80211_IFTYPE_WDS);
 
 	rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
Signature · 1 line
1.8.0.2
#1 lore raw

Hi Felix,

Quoted 3 lines · Felix Fietkau

If CONFIG_MAC80211_MESH is not set, cfg80211 will now allow advertising interface combinations with NL80211_IFTYPE_MESH_POINT present. Add appropriate ifdefs to avoid running into errors.

I'm not sure if rt2x00 is the proper place to fix this. To me it doesn't look good to have to sprinkle these kind of ifdefs throughout the drivers to check if mac80211 has mesh enabled.
I would prefer a solution where drivers are still able to indicate that they support mesh interfaces, but where mac80211/cfg80211 prevent these kind of interfaces from being created.

@Johannes: What is your view on this?

Quoted 41 lines
---
 drivers/net/wireless/rt2x00/rt2x00dev.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/rt2x00/rt2x00dev.c +6 -3
index 1031db6..189744d 100644
@@ -1236,8 +1236,10 @@ static inline void rt2x00lib_set_if_combinations(struct rt2x00_dev *rt2x00dev)
         */
        if_limit = &rt2x00dev->if_limits_ap;
        if_limit->max = rt2x00dev->ops->max_ap_intf;
-       if_limit->types = BIT(NL80211_IFTYPE_AP) |
-                       BIT(NL80211_IFTYPE_MESH_POINT);
+       if_limit->types = BIT(NL80211_IFTYPE_AP);
+#ifdef CONFIG_MAC80211_MESH
+       if_limit->types |= BIT(NL80211_IFTYPE_MESH_POINT);
+#endif
 
        /*
         * Build up AP interface combinations structure.
@@ -1309,7 +1311,9 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
                rt2x00dev->hw->wiphy->interface_modes |=
                    BIT(NL80211_IFTYPE_ADHOC) |
                    BIT(NL80211_IFTYPE_AP) |
+#ifdef CONFIG_MAC80211_MESH
                    BIT(NL80211_IFTYPE_MESH_POINT) |
+#endif
                    BIT(NL80211_IFTYPE_WDS);
 
        rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
--

1.8.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 2 lines
---
Gertjan
maintainer
#2 lore raw
Quoted 4 lines · Gertjan van Wingerde

Hi Felix,

Quoted 1 line · Felix Fietkau

If CONFIG_MAC80211_MESH is not set, cfg80211 will now allow advertising

typo: "will not allow"

Quoted 11 lines
Quoted 2 lines

interface combinations with NL80211_IFTYPE_MESH_POINT present. Add appropriate ifdefs to avoid running into errors.

I'm not sure if rt2x00 is the proper place to fix this. To me it doesn't look good to have to sprinkle these kind of ifdefs throughout the drivers to check if mac80211 has mesh enabled.
I would prefer a solution where drivers are still able to indicate that they support mesh interfaces, but where mac80211/cfg80211 prevent these kind of interfaces from being created.

@Johannes: What is your view on this?

It would be nicer, but the data is const so mac80211 can't modify it, and I don't see that we should add a lot of code/handshaking to mac80211/cfg80211 just to avoid one ifdef here.

johannes

#3 lore raw
Quoted 18 lines · Johannes Berg
Quoted 4 lines · Gertjan van Wingerde

Hi Felix,

Quoted 1 line · Felix Fietkau

If CONFIG_MAC80211_MESH is not set, cfg80211 will now allow advertising

typo: "will not allow"

Quoted 10 lines
Quoted 2 lines

interface combinations with NL80211_IFTYPE_MESH_POINT present. Add appropriate ifdefs to avoid running into errors.

I'm not sure if rt2x00 is the proper place to fix this. To me it doesn't look good to have to sprinkle these kind of ifdefs throughout the drivers to check if mac80211 has mesh enabled.
I would prefer a solution where drivers are still able to indicate that they support mesh interfaces, but where mac80211/cfg80211 prevent these kind of interfaces from being created.

Quoted 6 lines
Quoted 1 line

@Johannes: What is your view on this?

It would be nicer, but the data is const so mac80211 can't modify it, and I don't see that we should add a lot of code/handshaking to mac80211/cfg80211 just to avoid one ifdef here.

OK. No worries. Was just looking if there was an alternative.

I'll ack Felix' patch then

Signature · 2 lines
---
Gertjan
Acked-by on v1 1/1
#4 lore raw
In reply to Felix Fietkau
Quoted 6 lines · Felix Fietkau

If CONFIG_MAC80211_MESH is not set, cfg80211 will now allow advertising interface combinations with NL80211_IFTYPE_MESH_POINT present. Add appropriate ifdefs to avoid running into errors.

Quoted 38 lines
---
 drivers/net/wireless/rt2x00/rt2x00dev.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/rt2x00/rt2x00dev.c +6 -3
index 1031db6..189744d 100644
@@ -1236,8 +1236,10 @@ static inline void rt2x00lib_set_if_combinations(struct rt2x00_dev *rt2x00dev)
         */
        if_limit = &rt2x00dev->if_limits_ap;
        if_limit->max = rt2x00dev->ops->max_ap_intf;
-       if_limit->types = BIT(NL80211_IFTYPE_AP) |
-                       BIT(NL80211_IFTYPE_MESH_POINT);
+       if_limit->types = BIT(NL80211_IFTYPE_AP);
+#ifdef CONFIG_MAC80211_MESH
+       if_limit->types |= BIT(NL80211_IFTYPE_MESH_POINT);
+#endif
 
        /*
         * Build up AP interface combinations structure.
@@ -1309,7 +1311,9 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
                rt2x00dev->hw->wiphy->interface_modes |=
                    BIT(NL80211_IFTYPE_ADHOC) |
                    BIT(NL80211_IFTYPE_AP) |
+#ifdef CONFIG_MAC80211_MESH
                    BIT(NL80211_IFTYPE_MESH_POINT) |
+#endif
                    BIT(NL80211_IFTYPE_WDS);
 
        rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
--

1.8.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 2 lines
---
Gertjan