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

Commit 6bab2e19 authored by Tom Gundersen's avatar Tom Gundersen Committed by Johannes Berg
Browse files

cfg80211: pass name_assign_type to rdev_add_virtual_intf() 



This will expose in /sys whether the ifname of a device is set by
userspace or generated by the kernel. The latter kind (wlanX, etc)
is not deterministic, so userspace needs to rename these devices
to names that are guaranteed to stay the same between reboots. The
former, however should never be renamed, so userspace needs to be
able to reliably tell the difference.

Similar functionality was introduced for the rtnetlink core in
commit 5517750f ("net: rtnetlink - make create_link take name_assign_type")

Signed-off-by: default avatarTom Gundersen <teg@jklm.no>
Cc: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Arend van Spriel <arend@broadcom.com>
Cc: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Cc: Hante Meuleman <meuleman@broadcom.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
[reformat changelog to fit 72 cols]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6a8b4adb

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

+4 −2
Original line number Diff line number Diff line
@@ -1496,6 +1496,7 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy, 


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)
@@ -1514,7 +1515,7 @@ static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy, 
		return ERR_PTR(-EINVAL);

	}



	wdev = ath6kl_interface_add(ar, name, type, if_idx, nw_type);

	wdev = ath6kl_interface_add(ar, name, name_assign_type, type, if_idx, nw_type);

	if (!wdev)

		return ERR_PTR(-ENOMEM);
@@ -3634,13 +3635,14 @@ void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif) 
}



struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,

					  unsigned char name_assign_type,

					  enum nl80211_iftype type,

					  u8 fw_vif_idx, u8 nw_type)

{

	struct net_device *ndev;

	struct ath6kl_vif *vif;



	ndev = alloc_netdev(sizeof(*vif), name, NET_NAME_UNKNOWN, ether_setup);

	ndev = alloc_netdev(sizeof(*vif), name, name_assign_type, ether_setup);

	if (!ndev)

		return NULL;

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ enum ath6kl_cfg_suspend_mode { 
};



struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,

					  unsigned char name_assign_type,

					  enum nl80211_iftype type,

					  u8 fw_vif_idx, u8 nw_type);

void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,

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

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type) 
	rtnl_lock();



	/* Add an initial station interface */

	wdev = ath6kl_interface_add(ar, "wlan%d", NL80211_IFTYPE_STATION, 0,

				    INFRA_NETWORK);

	wdev = ath6kl_interface_add(ar, "wlan%d", NET_NAME_ENUM,

				    NL80211_IFTYPE_STATION, 0, INFRA_NETWORK);



	rtnl_unlock();

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

+2 −1
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ static bool brcmf_is_ibssmode(struct brcmf_cfg80211_vif *vif) 


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)
@@ -648,7 +649,7 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy, 
	case NL80211_IFTYPE_P2P_CLIENT:

	case NL80211_IFTYPE_P2P_GO:

	case NL80211_IFTYPE_P2P_DEVICE:

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

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

		if (!IS_ERR(wdev))

			brcmf_cfg80211_update_proto_addr_mode(wdev);

		return wdev;

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

+3 −0
Original line number Diff line number Diff line
@@ -2246,11 +2246,13 @@ static void brcmf_p2p_delete_p2pdev(struct brcmf_p2p_info *p2p, 
 *

 * @wiphy: wiphy device of new interface.

 * @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,

				       struct vif_params *params)

{
@@ -2310,6 +2312,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, 
	}



	strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);

	ifp->ndev->name_assign_type = name_assign_type;

	err = brcmf_net_attach(ifp, true);

	if (err) {

		brcmf_err("Registering netdevice failed\n");