---

yaml --- r: 187991 b: refs/heads/master c: 2b4c329 h: refs/heads/master i: 187989: 0bd33a5 187987: 029d098 187983: 9dbb0ed v: v3
git-mirror · Mar 10, 2010 · 02a55e9 · 02a55e9
1 parent cfaf470
commit 02a55e9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3041f5170751e3522aa1bd6e8ca5d98e846720b0
+refs/heads/master: 2b4c32972b9bcfee29d5e2c1b6f261dda5ef2a21
diff --git a/trunk/include/net/ip6_tunnel.h b/trunk/include/net/ip6_tunnel.h
@@ -15,7 +15,6 @@
 struct ip6_tnl {
 	struct ip6_tnl *next;	/* next tunnel in list */
 	struct net_device *dev;	/* virtual device associated with tunnel */
-	int recursion;		/* depth of hard_start_xmit recursion */
 	struct ip6_tnl_parm parms;	/* tunnel configuration parameters */
 	struct flowi fl;	/* flowi template for xmit */
 	struct dst_entry *dst_cache;    /* cached dst */