From: Chen-Li Tien <cltien@gmail.com>
Date: Tue, 5 Sep 2006 20:15:08 +0000 (+0200)
Subject: PKTGEN: Fix oops when used with balance-tlb bonding
X-Git-Tag: v2.6.17.12~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3658cfac5012abbb8bed0bb027983e1cdf168bc;p=thirdparty%2Fkernel%2Fstable.git

PKTGEN: Fix oops when used with balance-tlb bonding

Signed-off-by: Chen-Li Tien <cltien@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 7db70d0ad7222..b916b7fe2997d 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2149,6 +2149,8 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev,
 	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);