Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965278AbWIFXG2 (ORCPT ); Wed, 6 Sep 2006 19:06:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965124AbWIFXF7 (ORCPT ); Wed, 6 Sep 2006 19:05:59 -0400 Received: from mail.kroah.org ([69.55.234.183]:29133 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S965070AbWIFXDG (ORCPT ); Wed, 6 Sep 2006 19:03:06 -0400 Date: Wed, 6 Sep 2006 15:57:32 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Chen-Li Tien , David Miller , Adrian Bunk Subject: [patch 27/37] PKTGEN: Fix oops when used with balance-tlb bonding Message-ID: <20060906225732.GB15922@kroah.com> References: <20060906224631.999046890@quad.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="pktgen-fix-oops-when-used-with-balance-tlb-bonding.patch" In-Reply-To: <20060906225444.GA15922@kroah.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 980 Lines: 32 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Chen-Li Tien Signed-off-by: Chen-Li Tien Signed-off-by: David S. Miller Signed-off-by: Adrian Bunk --- net/core/pktgen.c | 2 ++ 1 file changed, 2 insertions(+) --- linux-2.6.17.11.orig/net/core/pktgen.c +++ linux-2.6.17.11/net/core/pktgen.c @@ -2149,6 +2149,8 @@ static struct sk_buff *fill_packet_ipv4( skb->mac.raw = ((u8 *) iph) - 14 - pkt_dev->nr_labels*sizeof(u32); skb->dev = odev; skb->pkt_type = PACKET_HOST; + skb->nh.iph = iph; + skb->h.uh = udph; if (pkt_dev->nfrags <= 0) pgh = (struct pktgen_hdr *)skb_put(skb, datalen); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/