From patchwork Mon Nov 8 09:19:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junchang Wang X-Patchwork-Id: 70404 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 2308CB6EF2 for ; Mon, 8 Nov 2010 20:20:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754271Ab0KHJT5 (ORCPT ); Mon, 8 Nov 2010 04:19:57 -0500 Received: from mail-pz0-f46.google.com ([209.85.210.46]:63219 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754228Ab0KHJT4 (ORCPT ); Mon, 8 Nov 2010 04:19:56 -0500 Received: by pzk28 with SMTP id 28so793312pzk.19 for ; Mon, 08 Nov 2010 01:19:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=TYP6xmqPS825mpbzsMRjDMU2RaBAVHsKIIZajn/dIIs=; b=ThsMFN8sUnQix3VWfBeD1w6vOI6olmcBMyxcGCwFQ9r9cfAK2Syt67/BwrvAyGuOb5 O3d6wnEUZX+ZDHbovNtVOjfCV4fufZHH5MRTjyiRUS5PC1cgKWqJwvDuU2V/wJ1xyD97 PxruxAEpKD+pYLtukaMdN1HlIVp5Xpw6Htxec= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=RwpjgBGfD/LcJcLAGJwC8PI6YoH8a2ZCaYEZ9wGxYJvChBU0zl06MzSSoxLMRAMP7j wGTvkgea4+88ozCglvGeaLTzhq7zgqqCkJZzbJZSdhhDV3MVYCUgNFMQAbCNdbfonPzr werzHk+qXeRHCLzfKu201SoXCYMFQrmUVP8CI= Received: by 10.142.213.21 with SMTP id l21mr1893311wfg.272.1289207995942; Mon, 08 Nov 2010 01:19:55 -0800 (PST) Received: from Desktop-Junchang ([58.211.218.74]) by mx.google.com with ESMTPS id x35sm7755889wfd.1.2010.11.08.01.19.51 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 08 Nov 2010 01:19:54 -0800 (PST) Date: Mon, 8 Nov 2010 17:19:43 +0800 From: Junchang Wang To: davem@davemloft.net, robert.olsson@its.uu.se, eric.dumazet@gmail.com, joe@perches.com, andy.shevchenko@gmail.com, backyes@mail.ustc.edu.cn Cc: netdev@vger.kernel.org Subject: [PATCH] pktgen: correct uninitialized queue_map Message-ID: <20101108091941.GB5025@Desktop-Junchang> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This fix a bug reported by backyes. Right the first time pktgen's using queue_map that's not been initialized by set_cur_queue_map(pkt_dev); Signed-off-by: Junchang Wang Signed-off-by: Backyes --- net/core/pktgen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- --Junchang -- 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 2c0df0f..564d9ba 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2611,8 +2611,8 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, /* Update any of the values, used when we're incrementing various * fields. */ - queue_map = pkt_dev->cur_queue_map; mod_cur_headers(pkt_dev); + queue_map = pkt_dev->cur_queue_map; datalen = (odev->hard_header_len + 16) & ~0xf; @@ -2975,8 +2975,8 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev, /* Update any of the values, used when we're incrementing various * fields. */ - queue_map = pkt_dev->cur_queue_map; mod_cur_headers(pkt_dev); + queue_map = pkt_dev->cur_queue_map; skb = __netdev_alloc_skb(odev, pkt_dev->cur_pkt_size + 64