diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-12 19:24:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-12 19:24:26 -0800 |
| commit | aa5743cc2c4fdd15e65367acc64bbb21a766d197 (patch) | |
| tree | 465a1c96795f6e25e863e4efdf55a5eed2dd242c /include/linux | |
| parent | e45d557978b136ddc8f40656e8fe0be18d8f7a19 (diff) | |
| parent | b16f3385ec5fa776684edfe6654736b79ec7fc4e (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 5 | ||||
| -rw-r--r-- | include/linux/pkt_cls.h | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 9fa9c7ead784..c880b0ee02b3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -902,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 *)); diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index de9e1311ecbf..45ac289f1bbf 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -138,9 +138,9 @@ struct tc_police struct tcf_t { - __u32 install; - __u32 lastuse; - __u32 expires; + __u64 install; + __u64 lastuse; + __u64 expires; }; struct tc_cnt |