projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'linux-can-fixes-for-4.7-20160623' of git://git.kernel.org/pub/scm/linux...
[deliverable/linux.git]
/
net
/
ipv4
/
ipip.c
diff --git
a/net/ipv4/ipip.c
b/net/ipv4/ipip.c
index 92827483ee3d7f03881e5cededec380fa3f15885..978370132f29f3bcce0ae419e52d954a43c5488c 100644
(file)
--- a/
net/ipv4/ipip.c
+++ b/
net/ipv4/ipip.c
@@
-219,7
+219,7
@@
static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(skb->protocol != htons(ETH_P_IP)))
goto tx_error;
- if (iptunnel_handle_offloads(skb, SKB_GSO_IP
IP
))
+ if (iptunnel_handle_offloads(skb, SKB_GSO_IP
XIP4
))
goto tx_error;
skb_set_inner_ipproto(skb, IPPROTO_IPIP);
This page took
0.027179 seconds
and
5
git commands to generate.