Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5919a07d authored by Janusz Dziedzic's avatar Janusz Dziedzic Committed by Greg Kroah-Hartman
Browse files

cfg80211: correct bridge/4addr mode check 



[ Upstream commit 689a0a9f505f7bffdefe6f17fddb41c8ab6344f6 ]

Without the patch we fail:

$ sudo brctl addbr br0
$ sudo brctl addif br0 wlp1s0
$ sudo iw wlp1s0 set 4addr on
command failed: Device or resource busy (-16)

Last command failed but iface was already in 4addr mode.

Fixes: ad4bb6f8 ("cfg80211: disallow bridging managed/adhoc interfaces")
Signed-off-by: default avatarJanusz Dziedzic <janusz.dziedzic@gmail.com>
Link: https://lore.kernel.org/r/20211024201546.614379-1-janusz.dziedzic@gmail.com


[add fixes tag, fix indentation, edit commit log]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent dba9e632

net/wireless/util.c

+7 −7
Original line number Diff line number Diff line
@@ -975,6 +975,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev, 
	    !(rdev->wiphy.interface_modes & (1 << ntype)))

		return -EOPNOTSUPP;



	if (ntype != otype) {

		/* if it's part of a bridge, reject changing type to station/ibss */

		if (netif_is_bridge_port(dev) &&

		    (ntype == NL80211_IFTYPE_ADHOC ||
@@ -982,7 +983,6 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev, 
		     ntype == NL80211_IFTYPE_P2P_CLIENT))

			return -EBUSY;



	if (ntype != otype) {

		dev->ieee80211_ptr->use_4addr = false;

		dev->ieee80211_ptr->mesh_id_up_len = 0;

		wdev_lock(dev->ieee80211_ptr);