From 9a92429171a6d3988523db977a5adc502eeacc1a Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 10 Nov 2004 22:40:27 -0800 Subject: [NET]: Remove net_init.c ifdef clutter. Signed-off-by: David S. Miller --- include/linux/netdevice.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include/linux') 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 *)); -- cgit v1.2.3 From 909ef4877adef308bf8aceea40bc4621ffafb533 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 10 Nov 2004 22:52:44 -0800 Subject: [PKT_SCHED]: Fix overflow on 64bit in times reported to userspace. This patch fixes on overflow in tc actions times reported to userspace on 64 bit architectures. struct tcf_t only contains 32-bit timestamps, but they are initialized to jiffies. When jiffies is larger than 2^32-1 only the low 32 bit are saved, and the diff between jiffies and the current timestamp becomes very large. This happens immediately after boottime since jiffies is initialized to 2^32-300. It was invisible until now because only the lower 32bit were reported to userspace, but with the USER_HZ conversion the reported times start somewhere around 4294967s. This patch extends the timestamps to 64bit. It breaks userspace compatibility for actions, but considering that most of this is not even in iproute yet this should be acceptable. Signed-off-by: Patrick McHardy ACK'd by: Jamal Hadi Salim Signed-off-by: David S. Miller --- include/linux/pkt_cls.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/linux') 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 -- cgit v1.2.3