git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
net
/
ipip.h
diff --git
a/include/net/ipip.h
b/include/net/ipip.h
index
f490c3c
..
7cdc914
100644
(file)
--- a/
include/net/ipip.h
+++ b/
include/net/ipip.h
@@
-35,7
+35,7
@@
struct ip_tunnel
ip_send_check(iph); \
\
err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, dst_output);\
ip_send_check(iph); \
\
err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, dst_output);\
- if (
err == NET_XMIT_SUCCESS || err == NET_XMIT_CN) {
\
+ if (
net_xmit_eval(err) == 0) {
\
stats->tx_bytes += pkt_len; \
stats->tx_packets++; \
} else { \
stats->tx_bytes += pkt_len; \
stats->tx_packets++; \
} else { \
@@
-44,8
+44,4
@@
struct ip_tunnel
} \
} while (0)
} \
} while (0)
-
-extern int sit_init(void);
-extern void sit_cleanup(void);
-
#endif
#endif