Commit 2608bab9 authored by Stephen Hemminger's avatar Stephen Hemminger

[NET]: Mark init_etherdev() as deprecated.

parent eb1a40d9
...@@ -197,9 +197,13 @@ static struct net_device *init_netdev(struct net_device *dev, int sizeof_priv, ...@@ -197,9 +197,13 @@ static struct net_device *init_netdev(struct net_device *dev, int sizeof_priv,
* *
* If an empty string area is passed as dev->name, or a new structure is made, * If an empty string area is passed as dev->name, or a new structure is made,
* a new name string is constructed. * a new name string is constructed.
*
* Deprecated because of exposed window between device registration
* and interfaces pointers that need to be set by driver.
* Use alloc_etherdev and register_netdev instead.
*/ */
struct net_device *init_etherdev(struct net_device *dev, int sizeof_priv) struct net_device *__init_etherdev(struct net_device *dev, int sizeof_priv)
{ {
return init_netdev(dev, sizeof_priv, "eth%d", ether_setup); return init_netdev(dev, sizeof_priv, "eth%d", ether_setup);
} }
...@@ -222,7 +226,7 @@ struct net_device *alloc_etherdev(int sizeof_priv) ...@@ -222,7 +226,7 @@ struct net_device *alloc_etherdev(int sizeof_priv)
return alloc_netdev(sizeof_priv, "eth%d", ether_setup); return alloc_netdev(sizeof_priv, "eth%d", ether_setup);
} }
EXPORT_SYMBOL(init_etherdev); EXPORT_SYMBOL(__init_etherdev);
EXPORT_SYMBOL(alloc_etherdev); EXPORT_SYMBOL(alloc_etherdev);
static int eth_mac_addr(struct net_device *dev, void *p) static int eth_mac_addr(struct net_device *dev, void *p)
......
...@@ -38,7 +38,13 @@ extern int eth_header_cache(struct neighbour *neigh, ...@@ -38,7 +38,13 @@ extern int eth_header_cache(struct neighbour *neigh,
struct hh_cache *hh); struct hh_cache *hh);
extern int eth_header_parse(struct sk_buff *skb, extern int eth_header_parse(struct sk_buff *skb,
unsigned char *haddr); unsigned char *haddr);
extern struct net_device *init_etherdev(struct net_device *dev, int sizeof_priv); extern struct net_device *__init_etherdev(struct net_device *dev, int sizeof_priv);
static inline __deprecated struct net_device *init_etherdev(struct net_device *dev,
int sizeof_priv)
{
return __init_etherdev(dev, sizeof_priv);
}
extern struct net_device *alloc_etherdev(int sizeof_priv); extern struct net_device *alloc_etherdev(int sizeof_priv);
static inline void eth_copy_and_sum (struct sk_buff *dest, unsigned char *src, int len, int base) static inline void eth_copy_and_sum (struct sk_buff *dest, unsigned char *src, int len, int base)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment