diff options
author | Tom Gundersen <teg@jklm.no> | 2014-07-14 10:37:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-15 19:12:48 -0400 |
commit | c835a677331495cf137a7f8a023463afd9f032f8 (patch) | |
tree | ca1b7c3aa3c2404f7912388e70f7e0cb9cf37043 /net/mac80211 | |
parent | 238fa3623a5709d29673ed78ff8e714d040fbb89 (diff) |
net: set name_assign_type in alloc_netdev()
Extend alloc_netdev{,_mq{,s}}() to take name_assign_type as argument, and convert
all users to pass NET_NAME_UNKNOWN.
Coccinelle patch:
@@
expression sizeof_priv, name, setup, txqs, rxqs, count;
@@
(
-alloc_netdev_mqs(sizeof_priv, name, setup, txqs, rxqs)
+alloc_netdev_mqs(sizeof_priv, name, NET_NAME_UNKNOWN, setup, txqs, rxqs)
|
-alloc_netdev_mq(sizeof_priv, name, setup, count)
+alloc_netdev_mq(sizeof_priv, name, NET_NAME_UNKNOWN, setup, count)
|
-alloc_netdev(sizeof_priv, name, setup)
+alloc_netdev(sizeof_priv, name, NET_NAME_UNKNOWN, setup)
)
v9: move comments here from the wrong commit
Signed-off-by: Tom Gundersen <teg@jklm.no>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/iface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index bbf51b2f0651..4edfc7c1524f 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -1624,9 +1624,9 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, | |||
1624 | if (local->hw.queues >= IEEE80211_NUM_ACS) | 1624 | if (local->hw.queues >= IEEE80211_NUM_ACS) |
1625 | txqs = IEEE80211_NUM_ACS; | 1625 | txqs = IEEE80211_NUM_ACS; |
1626 | 1626 | ||
1627 | ndev = alloc_netdev_mqs(sizeof(*sdata) + | 1627 | ndev = alloc_netdev_mqs(sizeof(*sdata) + local->hw.vif_data_size, |
1628 | local->hw.vif_data_size, | 1628 | name, NET_NAME_UNKNOWN, |
1629 | name, ieee80211_if_setup, txqs, 1); | 1629 | ieee80211_if_setup, txqs, 1); |
1630 | if (!ndev) | 1630 | if (!ndev) |
1631 | return -ENOMEM; | 1631 | return -ENOMEM; |
1632 | dev_net_set(ndev, wiphy_net(local->hw.wiphy)); | 1632 | dev_net_set(ndev, wiphy_net(local->hw.wiphy)); |