Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Fix tbench regression in 2.6.25-rc1
+14
-9
+14
-9
include/net/dst.h
+14
-9
include/net/dst.h
···
52
52
unsigned short header_len; /* more space at head required */
53
53
unsigned short trailer_len; /* space to reserve at tail */
54
54
55
-
u32 metrics[RTAX_MAX];
56
-
struct dst_entry *path;
57
-
58
-
unsigned long rate_last; /* rate limiting for ICMP */
59
55
unsigned int rate_tokens;
56
+
unsigned long rate_last; /* rate limiting for ICMP */
60
57
61
-
#ifdef CONFIG_NET_CLS_ROUTE
62
-
__u32 tclassid;
63
-
#endif
58
+
struct dst_entry *path;
64
59
65
60
struct neighbour *neighbour;
66
61
struct hh_cache *hh;
···
65
70
int (*output)(struct sk_buff*);
66
71
67
72
struct dst_ops *ops;
68
-
69
-
unsigned long lastuse;
73
+
74
+
u32 metrics[RTAX_MAX];
75
+
76
+
#ifdef CONFIG_NET_CLS_ROUTE
77
+
__u32 tclassid;
78
+
#endif
79
+
80
+
/*
81
+
* __refcnt wants to be on a different cache line from
82
+
* input/output/ops or performance tanks badly
83
+
*/
70
84
atomic_t __refcnt; /* client references */
71
85
int __use;
86
+
unsigned long lastuse;
72
87
union {
73
88
struct dst_entry *next;
74
89
struct rtable *rt_next;