From patchwork Mon Aug 4 13:37:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Kiss X-Patchwork-Id: 376314 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 6E0F0140090 for ; Mon, 4 Aug 2014 23:38:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752829AbaHDNho (ORCPT ); Mon, 4 Aug 2014 09:37:44 -0400 Received: from smtp.citrix.com ([66.165.176.89]:64603 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752814AbaHDNhm (ORCPT ); Mon, 4 Aug 2014 09:37:42 -0400 X-IronPort-AV: E=Sophos;i="5.01,798,1400025600"; d="scan'208";a="158494537" From: Zoltan Kiss To: Steffen Klassert , Mathias Krause , Daniel Borkmann CC: Zoltan Kiss , "David S. Miller" , Thomas Graf , Joe Perches , , , Subject: [PATCH net-next 3/4 RFC] pktgen: Fixing UPD checksum calculation Date: Mon, 4 Aug 2014 14:37:13 +0100 Message-ID: <1407159435-7951-4-git-send-email-zoltan.kiss@citrix.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407159435-7951-1-git-send-email-zoltan.kiss@citrix.com> References: <1407159435-7951-1-git-send-email-zoltan.kiss@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It passes port number instead of IP address for checksuming. The udp4_hwcsum() call is also bad, but my next patch will get rid of it anyway. The IPv6 code does it correctly already. It also changes replaces 8 with sizeof(struct udphdr) Signed-off-by: Zoltan Kiss Cc: "David S. Miller" Cc: Thomas Graf Cc: Joe Perches Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: xen-devel@lists.xenproject.org --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/core/pktgen.c b/net/core/pktgen.c index ba61e2b..d8905cd 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -3061,8 +3061,9 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, __wsum csum = udp_csum(skb); /* add protocol-dependent pseudo-header */ - udph->check = csum_tcpudp_magic(udph->source, udph->dest, - datalen + 8, IPPROTO_UDP, csum); + udph->check = csum_tcpudp_magic(iph->saddr, iph->daddr, + datalen + sizeof(struct udphdr), + IPPROTO_UDP, csum); if (udph->check == 0) udph->check = CSUM_MANGLED_0;