forked from luck/tmp_suning_uos_patched
64194c31a0
This patch makes the RX/TX byte counters for IPIP, GRE and SIT more consistent. Previously we included the external IP headers on the way out but not when the packet is inbound. The new scheme is to count payload only in both directions. For IPIP and SIT this simply means the exclusion of the external IP header. For GRE this means that we exclude the GRE header as well. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
56 lines
1.3 KiB
C
56 lines
1.3 KiB
C
#ifndef __NET_IPIP_H
|
|
#define __NET_IPIP_H 1
|
|
|
|
#include <linux/if_tunnel.h>
|
|
#include <net/ip.h>
|
|
|
|
/* Keep error state on tunnel for 30 sec */
|
|
#define IPTUNNEL_ERR_TIMEO (30*HZ)
|
|
|
|
struct ip_tunnel
|
|
{
|
|
struct ip_tunnel *next;
|
|
struct net_device *dev;
|
|
|
|
int recursion; /* Depth of hard_start_xmit recursion */
|
|
int err_count; /* Number of arrived ICMP errors */
|
|
unsigned long err_time; /* Time when the last ICMP error arrived */
|
|
|
|
/* These four fields used only by GRE */
|
|
__u32 i_seqno; /* The last seen seqno */
|
|
__u32 o_seqno; /* The last output seqno */
|
|
int hlen; /* Precalculated GRE header length */
|
|
int mlink;
|
|
|
|
struct ip_tunnel_parm parms;
|
|
|
|
struct ip_tunnel_prl_entry *prl; /* potential router list */
|
|
unsigned int prl_count; /* # of entries in PRL */
|
|
};
|
|
|
|
struct ip_tunnel_prl_entry
|
|
{
|
|
struct ip_tunnel_prl_entry *next;
|
|
__be32 addr;
|
|
u16 flags;
|
|
};
|
|
|
|
#define IPTUNNEL_XMIT() do { \
|
|
int err; \
|
|
int pkt_len = skb->len - skb_transport_offset(skb); \
|
|
\
|
|
skb->ip_summed = CHECKSUM_NONE; \
|
|
ip_select_ident(iph, &rt->u.dst, NULL); \
|
|
\
|
|
err = ip_local_out(skb); \
|
|
if (net_xmit_eval(err) == 0) { \
|
|
stats->tx_bytes += pkt_len; \
|
|
stats->tx_packets++; \
|
|
} else { \
|
|
stats->tx_errors++; \
|
|
stats->tx_aborted_errors++; \
|
|
} \
|
|
} while (0)
|
|
|
|
#endif
|