From e5b4956d6aa46ffd4a9b95a18bb8da869c9438b9 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 13 Oct 2003 23:20:19 -0700 Subject: [PATCH] [NET]: Mark dev_alloc as deprecated. --- include/linux/netdevice.h | 6 +++++- net/core/dev.c | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 03936a77f3da4..2a53de551b536 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -511,7 +511,11 @@ extern struct net_device *__dev_get_by_flags(unsigned short flags, unsigned short mask); extern struct net_device *dev_get_by_name(const char *name); extern struct net_device *__dev_get_by_name(const char *name); -extern struct net_device *dev_alloc(const char *name, int *err); +extern struct net_device *__dev_alloc(const char *name, int *err); +static inline __deprecated struct net_device *dev_alloc(const char *name, int *err) +{ + return __dev_alloc(name, err); +} extern int dev_alloc_name(struct net_device *dev, const char *name); extern int dev_open(struct net_device *dev); extern int dev_close(struct net_device *dev); diff --git a/net/core/dev.c b/net/core/dev.c index b04cd42647a33..74d7342e045f9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -646,11 +646,12 @@ int dev_alloc_name(struct net_device *dev, const char *name) * failed. The cause of an error is returned as a negative errno code * in the variable @err points to. * - * The caller must hold the @dev_base or RTNL locks when doing this in + * This call is deprecated in favor of alloc_netdev because + * the caller must hold the @dev_base or RTNL locks when doing this in * order to avoid duplicate name allocations. */ -struct net_device *dev_alloc(const char *name, int *err) +struct net_device *__dev_alloc(const char *name, int *err) { struct net_device *dev = kmalloc(sizeof(*dev), GFP_KERNEL); @@ -2997,7 +2998,7 @@ EXPORT_SYMBOL(__dev_remove_pack); EXPORT_SYMBOL(__skb_linearize); EXPORT_SYMBOL(call_netdevice_notifiers); EXPORT_SYMBOL(dev_add_pack); -EXPORT_SYMBOL(dev_alloc); +EXPORT_SYMBOL(__dev_alloc); EXPORT_SYMBOL(dev_alloc_name); EXPORT_SYMBOL(dev_close); EXPORT_SYMBOL(dev_get_by_flags); -- 2.53.0