lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cfg80211: assign device type in netdev notifier callback

Browse Source 
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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Marcel Holtmann
2009-10-02 05:15:28 +00:00
committed by David S. Miller
parent 7ffbe3fdac
commit 053a93dd12
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/mac80211/iface.c
View File

@@ -754,10 +754,6 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata,
return 0; return 0;
} }
static struct device_type wiphy_type = {
.name = "wlan",
};
int ieee80211_if_add(struct ieee80211_local *local, const char *name, int ieee80211_if_add(struct ieee80211_local *local, const char *name,
struct net_device **new_dev, enum nl80211_iftype type, struct net_device **new_dev, enum nl80211_iftype type,
struct vif_params *params) 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); memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN);
SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); 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 */ /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */
sdata = netdev_priv(ndev); sdata = netdev_priv(ndev);

7
net/wireless/core.c
View File

@@ -625,6 +625,10 @@ static void wdev_cleanup_work(struct work_struct *work)
dev_put(wdev->netdev); dev_put(wdev->netdev);
} }
static struct device_type wiphy_type = {
.name = "wlan",
};
static int cfg80211_netdev_notifier_call(struct notifier_block * nb, static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
unsigned long state, unsigned long state,
void *ndev) void *ndev)
@@ -641,6 +645,9 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
WARN_ON(wdev->iftype == NL80211_IFTYPE_UNSPECIFIED); WARN_ON(wdev->iftype == NL80211_IFTYPE_UNSPECIFIED);
switch (state) { switch (state) {
case NETDEV_POST_INIT:
SET_NETDEV_DEVTYPE(dev, &wiphy_type);
break;
case NETDEV_REGISTER: case NETDEV_REGISTER:
/* /*
* NB: cannot take rdev->mtx here because this may be * NB: cannot take rdev->mtx here because this may be