diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-09-23 06:28:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-24 18:39:22 -0400 |
commit | a43912ab1925788765208da5cd664b6f8e011d08 (patch) | |
tree | 6f522dba1fd414b7da3999fa2da062d80a550874 /include/net/ipip.h | |
parent | edf42a27e8e242e543716663e54aa2b592ea070a (diff) |
tunnel: eliminate recursion field
It seems recursion field from "struct ip_tunnel" is not anymore needed.
recursion prevention is done at the upper level (in dev_queue_xmit()),
since we use HARD_TX_LOCK protection for tunnels.
This avoids a cache line ping pong on "struct ip_tunnel" : This structure
should be now mostly read on xmit and receive paths.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ipip.h')
-rw-r--r-- | include/net/ipip.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h index 5d3036fa1511..76e3ea6e2fe5 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h | |||
@@ -12,7 +12,6 @@ struct ip_tunnel | |||
12 | struct ip_tunnel *next; | 12 | struct ip_tunnel *next; |
13 | struct net_device *dev; | 13 | struct net_device *dev; |
14 | 14 | ||
15 | int recursion; /* Depth of hard_start_xmit recursion */ | ||
16 | int err_count; /* Number of arrived ICMP errors */ | 15 | int err_count; /* Number of arrived ICMP errors */ |
17 | unsigned long err_time; /* Time when the last ICMP error arrived */ | 16 | unsigned long err_time; /* Time when the last ICMP error arrived */ |
18 | 17 | ||