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

Commit 053a93dd authored by Marcel Holtmann's avatar Marcel Holtmann Committed by David S. Miller
Browse files

cfg80211: assign device type in netdev notifier callback 



Instead of having to modify every non-mac80211 for device type assignment,
do this inside the netdev notifier callback of cfg80211. So all drivers
that integrate with cfg80211 will export a proper device type.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ffbe3fd

net/mac80211/iface.c

+0 −5
Original line number Diff line number Diff line
@@ -754,10 +754,6 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, 
	return 0;

}



static struct device_type wiphy_type = {

	.name	= "wlan",

};



int ieee80211_if_add(struct ieee80211_local *local, const char *name,

		     struct net_device **new_dev, enum nl80211_iftype type,

		     struct vif_params *params)
@@ -789,7 +785,6 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, 


	memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);

	SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy));

	SET_NETDEV_DEVTYPE(ndev, &wiphy_type);



	/* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */

	sdata = netdev_priv(ndev);

net/wireless/core.c

+7 −0
Original line number Diff line number Diff line
@@ -625,6 +625,10 @@ static void wdev_cleanup_work(struct work_struct *work) 
	dev_put(wdev->netdev);

}



static struct device_type wiphy_type = {

	.name	= "wlan",

};



static int cfg80211_netdev_notifier_call(struct notifier_block * nb,

					 unsigned long state,

					 void *ndev)
@@ -641,6 +645,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb, 
	WARN_ON(wdev->iftype == NL80211_IFTYPE_UNSPECIFIED);



	switch (state) {

	case NETDEV_POST_INIT:

		SET_NETDEV_DEVTYPE(dev, &wiphy_type);

		break;

	case NETDEV_REGISTER:

		/*

		 * NB: cannot take rdev->mtx here because this may be