vserver 1.9.5.x5

[linux-2.6.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 8325475..eafc820 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -309,7 +309,9 @@ struct net_device
 
        /* List of functions to handle Wireless Extensions (instead of ioctl).
         * See <net/iw_handler.h> for details. Jean II */
-       struct iw_handler_def * wireless_handlers;
+       const struct iw_handler_def *   wireless_handlers;
+       /* Instance data managed by the core of Wireless Extensions. */
+       struct iw_public_data * wireless_data;
 
        struct ethtool_ops *ethtool_ops;
 
@@ -343,6 +345,7 @@ struct net_device
        unsigned char           broadcast[MAX_ADDR_LEN];        /* hw bcast add */
        unsigned char           dev_addr[MAX_ADDR_LEN]; /* hw address   */
        unsigned char           addr_len;       /* hardware address length      */
+       unsigned short          dev_id;         /* for shared network cards */
 
        struct dev_mc_list      *mc_list;       /* Multicast mac addresses      */
        int                     mc_count;       /* Number of installed mcasts   */
@@ -520,24 +523,16 @@ extern struct net_device          loopback_dev;           /* The loopback */
 extern struct net_device               *dev_base;              /* All devices */
 extern rwlock_t                                dev_base_lock;          /* Device list lock */
 
-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);
@@ -551,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);
@@ -675,6 +669,7 @@ static inline void dev_kfree_skb_any(struct sk_buff *skb)
 
 #define HAVE_NETIF_RX 1
 extern int             netif_rx(struct sk_buff *skb);
+extern int             netif_rx_ni(struct sk_buff *skb);
 #define HAVE_NETIF_RECEIVE_SKB 1
 extern int             netif_receive_skb(struct sk_buff *skb);
 extern int             dev_ioctl(unsigned int cmd, void __user *);
@@ -689,17 +684,6 @@ extern void                dev_init(void);
 
 extern int             netdev_nit;
 
-/* Post buffer to the network code from _non interrupt_ context.
- * see net/core/dev.c for netif_rx description.
- */
-static inline int netif_rx_ni(struct sk_buff *skb)
-{
-       int err = netif_rx(skb);
-       if (softirq_pending(smp_processor_id()))
-               do_softirq();
-       return err;
-}
-
 /* Called by rtnetlink.c:rtnl_unlock() */
 extern void netdev_run_todo(void);
 
@@ -918,10 +902,7 @@ static inline void netif_tx_disable(struct net_device *dev)
 /* These functions live elsewhere (drivers/net/net_init.c, but related) */
 
 extern void            ether_setup(struct net_device *dev);
-extern void            fddi_setup(struct net_device *dev);
-extern void            tr_setup(struct net_device *dev);
-extern void            fc_setup(struct net_device *dev);
-extern void            fc_freedev(struct net_device *dev);
+
 /* Support for loadable net-drivers */
 extern struct net_device *alloc_netdev(int sizeof_priv, const char *name,
                                       void (*setup)(struct net_device *));
@@ -938,14 +919,15 @@ extern void               netdev_state_change(struct net_device *dev);
 /* Load a device via the kmod */
 extern void            dev_load(const char *name);
 extern void            dev_mcast_init(void);
-extern int             netdev_register_fc(struct net_device *dev, void (*stimul)(struct net_device *dev));
-extern void            netdev_unregister_fc(int bit);
 extern int             netdev_max_backlog;
 extern int             weight_p;
 extern unsigned long   netdev_fc_xoff;
 extern atomic_t netdev_dropping;
 extern int             netdev_set_master(struct net_device *dev, struct net_device *master);
-extern int skb_checksum_help(struct sk_buff **pskb, int inward);
+extern int skb_checksum_help(struct sk_buff *skb, int inward);
+/* rx skb timestamps */
+extern void            net_enable_timestamp(void);
+extern void            net_disable_timestamp(void);
 
 #ifdef CONFIG_SYSCTL
 extern char *net_sysctl_strdup(const char *s);