diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-10-05 03:11:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-05 03:21:57 -0400 |
commit | 0bfbedb14a8a96c529341bec88991a92b41fac72 (patch) | |
tree | d52ccb4758fd58cbf74c7a9001e6885275d3ddc8 /include/net/ipip.h | |
parent | 16c6cf8bb471392fd09b48b7c27e7d83a446b4bc (diff) |
tunnels: Optimize tx path
We currently dirty a cache line to update tunnel device stats
(tx_packets/tx_bytes). We better use the txq->tx_bytes/tx_packets
counters that already are present in cpu cache, in the cache
line shared with txq->_xmit_lock
This patch extends IPTUNNEL_XMIT() macro to use txq pointer
provided by the caller.
Also &tunnel->dev->stats can be replaced by &dev->stats
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h index 87acf8f3a155..0159221a8509 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h | |||
@@ -42,9 +42,9 @@ struct ip_tunnel_prl_entry | |||
42 | ip_select_ident(iph, &rt->u.dst, NULL); \ | 42 | ip_select_ident(iph, &rt->u.dst, NULL); \ |
43 | \ | 43 | \ |
44 | err = ip_local_out(skb); \ | 44 | err = ip_local_out(skb); \ |
45 | if (net_xmit_eval(err) == 0) { \ | 45 | if (likely(net_xmit_eval(err) == 0)) { \ |
46 | stats->tx_bytes += pkt_len; \ | 46 | txq->tx_bytes += pkt_len; \ |
47 | stats->tx_packets++; \ | 47 | txq->tx_packets++; \ |
48 | } else { \ | 48 | } else { \ |
49 | stats->tx_errors++; \ | 49 | stats->tx_errors++; \ |
50 | stats->tx_aborted_errors++; \ | 50 | stats->tx_aborted_errors++; \ |