aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorChen-Li Tien <cltien@gmail.com>2006-08-07 23:49:07 -0400
committerDavid S. Miller <davem@davemloft.net>2006-08-07 23:49:07 -0400
commitaaf580601ff244df82324fff380ed6740f27ef03 (patch)
treebe59a493781fddb2f0201de3d5e335524bbd1959 /net/core
parent8d1502de27c46b365b5c86e17d173083d3d6c9ac (diff)
[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>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/pktgen.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 67ed14ddabd2..b1743375eb6d 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,
2149 skb->mac.raw = ((u8 *) iph) - 14 - pkt_dev->nr_labels*sizeof(u32); 2149 skb->mac.raw = ((u8 *) iph) - 14 - pkt_dev->nr_labels*sizeof(u32);
2150 skb->dev = odev; 2150 skb->dev = odev;
2151 skb->pkt_type = PACKET_HOST; 2151 skb->pkt_type = PACKET_HOST;
2152 skb->nh.iph = iph;
2153 skb->h.uh = udph;
2152 2154
2153 if (pkt_dev->nfrags <= 0) 2155 if (pkt_dev->nfrags <= 0)
2154 pgh = (struct pktgen_hdr *)skb_put(skb, datalen); 2156 pgh = (struct pktgen_hdr *)skb_put(skb, datalen);