The patch titled
pktgen oops when used with balance-tlb bonding
has been removed from the -mm tree. Its filename is
pktgen-oops-when-used-with-balance-tlb-bonding.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: pktgen oops when used with balance-tlb bonding
From: "Tien ChenLi" <cltien@xxxxxxxxx>
Fix a bug in pktgen so it won't cause oops when used with balance-tlb or
balance-alb bonding driver.
The root cause is that the bond_alb_xmit in bonding will peek the destination
address in packet via the skb->nh.iph pointer, generally this will be filled
by upper layer network driver, but the packet generated by pktgen will be sent
to device driver so it will need to set this pointer correctly. The other two
pointers are not necessary for now, they are set to avoid similar problem.
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/core/pktgen.c | 3 +++
1 file changed, 3 insertions(+)
diff -puN net/core/pktgen.c~pktgen-oops-when-used-with-balance-tlb-bonding net/core/pktgen.c
--- a/net/core/pktgen.c~pktgen-oops-when-used-with-balance-tlb-bonding
+++ a/net/core/pktgen.c
@@ -2149,6 +2149,9 @@ 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->mac.raw = eth;
+ skb->nh.iph = iph;
+ skb->h.uh = udph;
if (pkt_dev->nfrags <= 0)
pgh = (struct pktgen_hdr *)skb_put(skb, datalen);
_
Patches currently in -mm which might be from cltien@xxxxxxxxx are
git-net.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
