Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (afbf331e) · Commits · e / devices / android_kernel_fairphone_FP3

include/net/dst.h

+14 −9

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -71,9 +66,19 @@ struct dst_entry

		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;