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

Commit f38dd58c authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

cfg80211: don't add p2p device while in RFKILL 



Since P2P device doesn't have a netdev associated to it,
we cannot prevent the user to start it when in RFKILL.
So refuse to even add it when in RFKILL.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a754055a

net/wireless/core.c

+0 −2
Original line number Diff line number Diff line
@@ -958,8 +958,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, 
	case NETDEV_PRE_UP:

		if (!(wdev->wiphy->interface_modes & BIT(wdev->iftype)))

			return notifier_from_errno(-EOPNOTSUPP);

		if (rfkill_blocked(rdev->rfkill))

			return notifier_from_errno(-ERFKILL);

		ret = cfg80211_can_add_interface(rdev, wdev->iftype);

		if (ret)

			return notifier_from_errno(ret);

net/wireless/core.h

+3 −0
Original line number Diff line number Diff line
@@ -411,6 +411,9 @@ static inline int 
cfg80211_can_add_interface(struct cfg80211_registered_device *rdev,

			   enum nl80211_iftype iftype)

{

	if (rfkill_blocked(rdev->rfkill))

		return -ERFKILL;



	return cfg80211_can_change_interface(rdev, NULL, iftype);

}