---

yaml --- r: 214897 b: refs/heads/master c: c7d4426 h: refs/heads/master i: 214895: 7feabb6 v: v3
git-mirror · Oct 4, 2010 · 852fec3 · 852fec3
1 parent 244a52f
commit 852fec3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a7241c21b06c3a3f8ebcf3e347bd68556369da7
+refs/heads/master: c7d4426a98a5f6654cd0b4b33d9dab2e77192c18
diff --git a/trunk/include/net/dst.h b/trunk/include/net/dst.h
@@ -43,10 +43,11 @@ struct dst_entry {
 	short			error;
 	short			obsolete;
 	int			flags;
-#define DST_HOST		1
-#define DST_NOXFRM		2
-#define DST_NOPOLICY		4
-#define DST_NOHASH		8
+#define DST_HOST		0x0001
+#define DST_NOXFRM		0x0002
+#define DST_NOPOLICY		0x0004
+#define DST_NOHASH		0x0008
+#define DST_NOCACHE		0x0010
 	unsigned long		expires;
 
 	unsigned short		header_len;	/* more space at head required */

diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
@@ -1210,7 +1210,9 @@ int neigh_resolve_output(struct sk_buff *skb)
 	if (!neigh_event_send(neigh, skb)) {
 		int err;
 		struct net_device *dev = neigh->dev;
-		if (dev->header_ops->cache && !dst->hh) {
+		if (dev->header_ops->cache &&
+		    !dst->hh &&
+		    !(dst->flags & DST_NOCACHE)) {
 			write_lock_bh(&neigh->lock);
 			if (!dst->hh)
 				neigh_hh_init(neigh, dst, dst->ops->protocol);

diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
@@ -1107,6 +1107,7 @@ static int rt_intern_hash(unsigned hash, struct rtable *rt,
 		 * on the route gc list.
 		 */
 
+		rt->dst.flags |= DST_NOCACHE;
 		if (rt->rt_type == RTN_UNICAST || rt->fl.iif == 0) {
 			int err = arp_bind_neighbour(&rt->dst);
 			if (err) {