From patchwork Mon Jun 2 23:12:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 355102 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D36CF14009C for ; Tue, 3 Jun 2014 09:12:20 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752885AbaFBXMR (ORCPT ); Mon, 2 Jun 2014 19:12:17 -0400 Received: from mail-pb0-f52.google.com ([209.85.160.52]:62879 "EHLO mail-pb0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752485AbaFBXMQ (ORCPT ); Mon, 2 Jun 2014 19:12:16 -0400 Received: by mail-pb0-f52.google.com with SMTP id rr13so4718728pbb.11 for ; Mon, 02 Jun 2014 16:12:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=BVMmyyzVaFCb+aO7p3o7jrnyHfitkr2anRxrTvDphng=; b=EDnIDDPiuD9uiLbfXpy43utsWVo5O9yzJ/e0DOr20Xjr2OM/aeFxqyWziUzpOJ77KQ ivn2PqSrLq8PSFqPunl5YP/JZWSzkWIx74wO52rg3AwzpMyGAjMb63VUUq4liO6umnxO ekGrBP8CrPkVrtQCZwzbC1pZvA1NhGZXwt46bZdDdcMRDzK+WHt7hotHIdFkqomsfU1X NADRutQf37i35TMC4Madtsif911yauNsRdMM+UF4mj4IOFL4YCHyA5pxhlgS1FfgfPPW SuJXIbZjuASyTM0X46Wy+WGmMvTaqWLRLRMz1ndsO65wx6PAusvyQyi/wuT7ExSpUqBf IXaw== X-Received: by 10.66.226.172 with SMTP id rt12mr44286187pac.101.1401750735935; Mon, 02 Jun 2014 16:12:15 -0700 (PDT) Received: from localhost.net ([8.25.197.27]) by mx.google.com with ESMTPSA id jq6sm22251049pbb.76.2014.06.02.16.12.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jun 2014 16:12:15 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , "David S. Miller" Subject: [Patch net-next] ipv4: use skb frags api in udp4_hwcsum() Date: Mon, 2 Jun 2014 16:12:02 -0700 Message-Id: <1401750722-4324-1-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Cc: "David S. Miller" Signed-off-by: Cong Wang --- net/ipv4/udp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index e07d52b..3c07422 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -727,13 +727,12 @@ EXPORT_SYMBOL(udp_flush_pending_frames); void udp4_hwcsum(struct sk_buff *skb, __be32 src, __be32 dst) { struct udphdr *uh = udp_hdr(skb); - struct sk_buff *frags = skb_shinfo(skb)->frag_list; int offset = skb_transport_offset(skb); int len = skb->len - offset; int hlen = len; __wsum csum = 0; - if (!frags) { + if (!skb_has_frag_list(skb)) { /* * Only one fragment on the socket. */ @@ -742,15 +741,17 @@ void udp4_hwcsum(struct sk_buff *skb, __be32 src, __be32 dst) uh->check = ~csum_tcpudp_magic(src, dst, len, IPPROTO_UDP, 0); } else { + struct sk_buff *frags; + /* * HW-checksum won't work as there are two or more * fragments on the socket so that all csums of sk_buffs * should be together */ - do { + skb_walk_frags(skb, frags) { csum = csum_add(csum, frags->csum); hlen -= frags->len; - } while ((frags = frags->next)); + } csum = skb_checksum(skb, offset, hlen, csum); skb->ip_summed = CHECKSUM_NONE;