aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2010-03-09 16:47:52 +0000
committerDavid S. Miller <davem@davemloft.net>2010-03-10 07:32:29 -0800
commit2b4c32972b9bcfee29d5e2c1b6f261dda5ef2a21 (patch)
tree12d9e80acef03b91d6d54283b475ef8c2c57685c
parent3041f5170751e3522aa1bd6e8ca5d98e846720b0 (diff)
downloadkernel_samsung_espresso10-2b4c32972b9bcfee29d5e2c1b6f261dda5ef2a21.zip
kernel_samsung_espresso10-2b4c32972b9bcfee29d5e2c1b6f261dda5ef2a21.tar.gz
kernel_samsung_espresso10-2b4c32972b9bcfee29d5e2c1b6f261dda5ef2a21.tar.bz2
ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}.
Commit a43912ab19... ("tunnel: eliminate recursion field") eliminated use of recursion field from tunnel structures, but its definition still exists in ip6_tnl{}. Let's remove that unused field. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/ip6_tunnel.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index 83b4e00..fbf9d1c 100644
--- a/include/net/ip6_tunnel.h
+++ b/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 */