diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-10-02 01:15:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-05 03:43:34 -0400 |
commit | 053a93dd126f68ba37973f95f00af6045fa7c957 (patch) | |
tree | 2ecb601cf6ea7bb9c2f14649e2edcab06b7b1027 /net/mac80211/iface.c | |
parent | 7ffbe3fdace0bdfcdab8dc6c77506feda0871f79 (diff) |
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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index b8295cbd7e8f..f6005adcbf90 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -754,10 +754,6 @@ int ieee80211_if_change_type(struct ieee80211_sub_if_data *sdata, | |||
754 | return 0; | 754 | return 0; |
755 | } | 755 | } |
756 | 756 | ||
757 | static struct device_type wiphy_type = { | ||
758 | .name = "wlan", | ||
759 | }; | ||
760 | |||
761 | int ieee80211_if_add(struct ieee80211_local *local, const char *name, | 757 | int ieee80211_if_add(struct ieee80211_local *local, const char *name, |
762 | struct net_device **new_dev, enum nl80211_iftype type, | 758 | struct net_device **new_dev, enum nl80211_iftype type, |
763 | struct vif_params *params) | 759 | struct vif_params *params) |
@@ -789,7 +785,6 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, | |||
789 | 785 | ||
790 | memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); | 786 | memcpy(ndev->dev_addr, local->hw.wiphy->perm_addr, ETH_ALEN); |
791 | SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); | 787 | SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); |
792 | SET_NETDEV_DEVTYPE(ndev, &wiphy_type); | ||
793 | 788 | ||
794 | /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */ | 789 | /* don't use IEEE80211_DEV_TO_SUB_IF because it checks too much */ |
795 | sdata = netdev_priv(ndev); | 790 | sdata = netdev_priv(ndev); |