Messages in this thread | | | Date | Tue, 15 Dec 2015 11:31:29 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the net tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/geneve.c
between commit:
a322a1bcf329 ("geneve: Fix IPv6 xmit stats update.")
from the net tree and commit:
abe492b4f50c ("geneve: UDP checksum configuration via netlink")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/geneve.c index c2b79f5d1c89,0750d7a93878..000000000000 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@@ -966,7 -984,10 +984,8 @@@ static netdev_tx_t geneve6_xmit_skb(str } err = udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev, &fl6.saddr, &fl6.daddr, prio, ttl, - sport, geneve->dst_port, !udp_csum); + sport, geneve->dst_port, + !!(flags & GENEVE_F_UDP_ZERO_CSUM6_TX)); - - iptunnel_xmit_stats(err, &dev->stats, dev->tstats); return NETDEV_TX_OK; tx_error:
| |