From mboxrd@z Thu Jan 1 00:00:00 1970 From: Edward Cree Subject: [PATCH net-next 2/2] net: vxlan: enable local checksum offload on HW_CSUM devices Date: Thu, 17 Dec 2015 15:30:25 +0000 Message-ID: <5672D511.3050905@solarflare.com> References: <5672D466.6050900@solarflare.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: Tom Herbert , netdev To: David Miller Return-path: Received: from nbfkord-smmo04.seg.att.com ([209.65.160.86]:48727 "EHLO nbfkord-smmo04.seg.att.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932318AbbLQPak (ORCPT ); Thu, 17 Dec 2015 10:30:40 -0500 In-Reply-To: <5672D466.6050900@solarflare.com> Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Edward Cree --- drivers/net/vxlan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 6369a57..c1660d6 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1785,6 +1785,9 @@ static int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *sk bool udp_sum = !!(vxflags & VXLAN_F_UDP_CSUM); int type = udp_sum ? SKB_GSO_UDP_TUNNEL_CSUM : SKB_GSO_UDP_TUNNEL; u16 hdrlen = sizeof(struct vxlanhdr); + /* Is device able to do the inner checksum? */ + bool inner_csum = skb_dst(skb) && skb_dst(skb)->dev && + (skb_dst(skb)->dev->features & NETIF_F_HW_CSUM); if ((vxflags & VXLAN_F_REMCSUM_TX) && skb->ip_summed == CHECKSUM_PARTIAL) { @@ -1814,7 +1817,7 @@ static int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *sk if (WARN_ON(!skb)) return -ENOMEM; - skb = iptunnel_handle_offloads(skb, udp_sum, type); + skb = iptunnel_handle_offloads(skb, udp_sum && !inner_csum, type); if (IS_ERR(skb)) return PTR_ERR(skb); -- 2.4.3