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

Commit 818a986e authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: move add/change interface monitor flags into params 



Instead passing both flags, which can be NULL, and vif_params,
which are never NULL, move the flags into the vif_params and
use BIT(0), which is invalid from userspace, to indicate that
the flags were changed.

While updating all drivers, fix a small bug in wil6210 where
it was setting the flags to 0 instead of leaving them unchanged.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8c5e6889

drivers/net/wireless/ath/ath6kl/cfg80211.c

+1 −2
Original line number Diff line number Diff line
@@ -1505,7 +1505,6 @@ static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy, 
						      const char *name,

						      unsigned char name_assign_type,

						      enum nl80211_iftype type,

						      u32 *flags,

						      struct vif_params *params)

{

	struct ath6kl *ar = wiphy_priv(wiphy);
@@ -1552,7 +1551,7 @@ static int ath6kl_cfg80211_del_iface(struct wiphy *wiphy, 


static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy,

					struct net_device *ndev,

					enum nl80211_iftype type, u32 *flags,

					enum nl80211_iftype type,

					struct vif_params *params)

{

	struct ath6kl_vif *vif = netdev_priv(ndev);

drivers/net/wireless/ath/wil6210/cfg80211.c

+4 −7
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ static struct wireless_dev * 
wil_cfg80211_add_iface(struct wiphy *wiphy, const char *name,

		       unsigned char name_assign_type,

		       enum nl80211_iftype type,

		       u32 *flags, struct vif_params *params)

		       struct vif_params *params)

{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);

	struct net_device *ndev = wil_to_ndev(wil);
@@ -306,7 +306,7 @@ static int wil_cfg80211_del_iface(struct wiphy *wiphy, 


static int wil_cfg80211_change_iface(struct wiphy *wiphy,

				     struct net_device *ndev,

				     enum nl80211_iftype type, u32 *flags,

				     enum nl80211_iftype type,

				     struct vif_params *params)

{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);
@@ -333,11 +333,8 @@ static int wil_cfg80211_change_iface(struct wiphy *wiphy, 
	case NL80211_IFTYPE_P2P_GO:

		break;

	case NL80211_IFTYPE_MONITOR:

		if (flags)

			wil->monitor_flags = *flags;

		else

			wil->monitor_flags = 0;



		if (params->flags)

			wil->monitor_flags = params->flags;

		break;

	default:

		return -EOPNOTSUPP;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+5 −7
Original line number Diff line number Diff line
@@ -575,12 +575,11 @@ static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp) 
 *

 * @wiphy: wiphy device of new interface.

 * @name: name of the new interface.

 * @flags: not used.

 * @params: contains mac address for AP device.

 */

static

struct wireless_dev *brcmf_ap_add_vif(struct wiphy *wiphy, const char *name,

				      u32 *flags, struct vif_params *params)

				      struct vif_params *params)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
@@ -653,7 +652,6 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy, 
						     const char *name,

						     unsigned char name_assign_type,

						     enum nl80211_iftype type,

						     u32 *flags,

						     struct vif_params *params)

{

	struct wireless_dev *wdev;
@@ -674,12 +672,12 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy, 
	case NL80211_IFTYPE_MESH_POINT:

		return ERR_PTR(-EOPNOTSUPP);

	case NL80211_IFTYPE_AP:

		wdev = brcmf_ap_add_vif(wiphy, name, flags, params);

		wdev = brcmf_ap_add_vif(wiphy, name, params);

		break;

	case NL80211_IFTYPE_P2P_CLIENT:

	case NL80211_IFTYPE_P2P_GO:

	case NL80211_IFTYPE_P2P_DEVICE:

		wdev = brcmf_p2p_add_vif(wiphy, name, name_assign_type, type, flags, params);

		wdev = brcmf_p2p_add_vif(wiphy, name, name_assign_type, type, params);

		break;

	case NL80211_IFTYPE_UNSPECIFIED:

	default:
@@ -858,7 +856,7 @@ int brcmf_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev) 


static s32

brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev,

			 enum nl80211_iftype type, u32 *flags,

			 enum nl80211_iftype type,

			 struct vif_params *params)

{

	struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);
@@ -6549,7 +6547,7 @@ static s32 brcmf_config_dongle(struct brcmf_cfg80211_info *cfg) 
	if (err)

		goto default_conf_out;

	err = brcmf_cfg80211_change_iface(wdev->wiphy, ndev, wdev->iftype,

					  NULL, NULL);

					  NULL);

	if (err)

		goto default_conf_out;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c

+1 −2
Original line number Diff line number Diff line
@@ -2141,12 +2141,11 @@ static struct wireless_dev *brcmf_p2p_create_p2pdev(struct brcmf_p2p_info *p2p, 
 * @name: name of the new interface.

 * @name_assign_type: origin of the interface name

 * @type: nl80211 interface type.

 * @flags: not used.

 * @params: contains mac address for P2P device.

 */

struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,

				       unsigned char name_assign_type,

				       enum nl80211_iftype type, u32 *flags,

				       enum nl80211_iftype type,

				       struct vif_params *params)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg, bool p2pdev_forced); 
void brcmf_p2p_detach(struct brcmf_p2p_info *p2p);

struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,

				       unsigned char name_assign_type,

				       enum nl80211_iftype type, u32 *flags,

				       enum nl80211_iftype type,

				       struct vif_params *params);

int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev);

int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,