diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-11-09 19:23:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-11-09 19:23:40 -0800 |
| commit | 2d2ddfcd28a1c587003f34dd9d3c67f5963b182f (patch) | |
| tree | d99ec62fcc750dee4780ad0316a0fb0642ee8d3e /include/linux | |
| parent | ad49d6baabfe0950d559e8becd2121fd02483cd8 (diff) | |
| parent | 09cdf3409fe94e7db77303d4716fa3676471f9b5 (diff) | |
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d2b2c8025dcd..9fa9c7ead784 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -526,20 +526,13 @@ extern int netdev_boot_setup_add(char *name, struct ifmap *map); extern int netdev_boot_setup_check(struct net_device *dev); extern unsigned long netdev_boot_base(const char *prefix, int unit); extern struct net_device *dev_getbyhwaddr(unsigned short type, char *hwaddr); -extern struct net_device *__dev_getfirstbyhwtype(unsigned short type); extern struct net_device *dev_getfirstbyhwtype(unsigned short type); extern void dev_add_pack(struct packet_type *pt); extern void dev_remove_pack(struct packet_type *pt); extern void __dev_remove_pack(struct packet_type *pt); -extern int __dev_get(const char *name); -static inline int __deprecated dev_get(const char *name) -{ - return __dev_get(name); -} + extern struct net_device *dev_get_by_flags(unsigned short flags, unsigned short mask); -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 int dev_alloc_name(struct net_device *dev, const char *name); @@ -553,7 +546,6 @@ extern void synchronize_net(void); extern int register_netdevice_notifier(struct notifier_block *nb); extern int unregister_netdevice_notifier(struct notifier_block *nb); extern int call_netdevice_notifiers(unsigned long val, void *v); -extern int dev_new_index(void); extern struct net_device *dev_get_by_index(int ifindex); extern struct net_device *__dev_get_by_index(int ifindex); extern int dev_restart(struct net_device *dev); |