From 02a55e9560c93a20df26ea024c3d3f9ccdc6216f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Tue, 9 Mar 2010 16:47:52 +0000 Subject: [PATCH] --- yaml --- r: 187991 b: refs/heads/master c: 2b4c32972b9bcfee29d5e2c1b6f261dda5ef2a21 h: refs/heads/master i: 187989: 0bd33a5510f7957a6482e8c8db29476d5a617c7c 187987: 029d098f13dce1163fb8c4c7589c40292e2ffcf8 187983: 9dbb0ed862e355d4a3211b95b704f5eb3bf1eb79 v: v3 --- [refs] | 2 +- trunk/include/net/ip6_tunnel.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a9389ef09e58..2aedf9922a9c 100644 --- 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 index 83b4e008b16d..fbf9d1cda27b 100644 --- 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 */