summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-15 09:21:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-15 09:21:04 -0700
commitafbf331ed1252c85753ac6790356c11e171f3d0b (patch)
tree40f3055808d5c33ea1d156cedc690895ae6201f9
parent6a6029b8cefe0ca7e82f27f3904dbedba3de4e06 (diff)
parentf1dd9c379cac7d5a76259e7dffcd5f8edc697d17 (diff)
downloadlinux-3.10-afbf331ed1252c85753ac6790356c11e171f3d0b.tar.gz
linux-3.10-afbf331ed1252c85753ac6790356c11e171f3d0b.tar.bz2
linux-3.10-afbf331ed1252c85753ac6790356c11e171f3d0b.zip
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
-rw-r--r--include/net/dst.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index e3ac7d0fc4e..ae13370e848 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -52,15 +52,10 @@ struct dst_entry
unsigned short header_len; /* more space at head required */
unsigned short trailer_len; /* space to reserve at tail */
- u32 metrics[RTAX_MAX];
- struct dst_entry *path;
-
- unsigned long rate_last; /* rate limiting for ICMP */
unsigned int rate_tokens;
+ unsigned long rate_last; /* rate limiting for ICMP */
-#ifdef CONFIG_NET_CLS_ROUTE
- __u32 tclassid;
-#endif
+ struct dst_entry *path;
struct neighbour *neighbour;
struct hh_cache *hh;
@@ -70,10 +65,20 @@ struct dst_entry
int (*output)(struct sk_buff*);
struct dst_ops *ops;
-
- unsigned long lastuse;
+
+ u32 metrics[RTAX_MAX];
+
+#ifdef CONFIG_NET_CLS_ROUTE
+ __u32 tclassid;
+#endif
+
+ /*
+ * __refcnt wants to be on a different cache line from
+ * input/output/ops or performance tanks badly
+ */
atomic_t __refcnt; /* client references */
int __use;
+ unsigned long lastuse;
union {
struct dst_entry *next;
struct rtable *rt_next;