From 036ac334ad0097c43697c62869abfe54b25eb935 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 19 Apr 2005 20:46:37 -0700
Subject: [PATCH] --- yaml --- r: 330 b: refs/heads/master c:
 c4d541106bc5d0a2134aaf9e8735eee3c70b0db2 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/include/net/dst.h | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 982852d8c06e..ec656f891337 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 561bbe3235da614562fb26bb14042af684971a2d
+refs/heads/master: c4d541106bc5d0a2134aaf9e8735eee3c70b0db2
diff --git a/trunk/include/net/dst.h b/trunk/include/net/dst.h
index 50adc9136530..4a056a682435 100644
--- a/trunk/include/net/dst.h
+++ b/trunk/include/net/dst.h
@@ -42,7 +42,8 @@ struct dst_entry
 	int			__use;
 	struct dst_entry	*child;
 	struct net_device       *dev;
-	int			obsolete;
+	short			error;
+	short			obsolete;
 	int			flags;
 #define DST_HOST		1
 #define DST_NOXFRM		2
@@ -61,8 +62,6 @@ struct dst_entry
 	unsigned long		rate_last;	/* rate limiting for ICMP */
 	unsigned long		rate_tokens;
 
-	int			error;
-
 	struct neighbour	*neighbour;
 	struct hh_cache		*hh;
 	struct xfrm_state	*xfrm;