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/802 | |
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/802')
-rw-r--r-- | net/802/fc.c | 2 | ||||
-rw-r--r-- | net/802/fddi.c | 3 | ||||
-rw-r--r-- | net/802/hippi.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/net/802/fc.c b/net/802/fc.c index 05eea6b98bb8..7c174b6750cd 100644 --- a/net/802/fc.c +++ b/net/802/fc.c | |||
@@ -126,6 +126,6 @@ static void fc_setup(struct net_device *dev) | |||
126 | */ | 126 | */ |
127 | struct net_device *alloc_fcdev(int sizeof_priv) | 127 | struct net_device *alloc_fcdev(int sizeof_priv) |
128 | { | 128 | { |
129 | return alloc_netdev(sizeof_priv, "fc%d", fc_setup); | 129 | return alloc_netdev(sizeof_priv, "fc%d", NET_NAME_UNKNOWN, fc_setup); |
130 | } | 130 | } |
131 | EXPORT_SYMBOL(alloc_fcdev); | 131 | EXPORT_SYMBOL(alloc_fcdev); |
diff --git a/net/802/fddi.c b/net/802/fddi.c index 9cda40661e0d..59e7346f1193 100644 --- a/net/802/fddi.c +++ b/net/802/fddi.c | |||
@@ -207,7 +207,8 @@ static void fddi_setup(struct net_device *dev) | |||
207 | */ | 207 | */ |
208 | struct net_device *alloc_fddidev(int sizeof_priv) | 208 | struct net_device *alloc_fddidev(int sizeof_priv) |
209 | { | 209 | { |
210 | return alloc_netdev(sizeof_priv, "fddi%d", fddi_setup); | 210 | return alloc_netdev(sizeof_priv, "fddi%d", NET_NAME_UNKNOWN, |
211 | fddi_setup); | ||
211 | } | 212 | } |
212 | EXPORT_SYMBOL(alloc_fddidev); | 213 | EXPORT_SYMBOL(alloc_fddidev); |
213 | 214 | ||
diff --git a/net/802/hippi.c b/net/802/hippi.c index 5ff2a718ddca..2e03f8259dd5 100644 --- a/net/802/hippi.c +++ b/net/802/hippi.c | |||
@@ -228,7 +228,8 @@ static void hippi_setup(struct net_device *dev) | |||
228 | 228 | ||
229 | struct net_device *alloc_hippi_dev(int sizeof_priv) | 229 | struct net_device *alloc_hippi_dev(int sizeof_priv) |
230 | { | 230 | { |
231 | return alloc_netdev(sizeof_priv, "hip%d", hippi_setup); | 231 | return alloc_netdev(sizeof_priv, "hip%d", NET_NAME_UNKNOWN, |
232 | hippi_setup); | ||
232 | } | 233 | } |
233 | 234 | ||
234 | EXPORT_SYMBOL(alloc_hippi_dev); | 235 | EXPORT_SYMBOL(alloc_hippi_dev); |