Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ac5459e authored by David S. Miller's avatar David S. Miller
Browse files

[PKTGEN]: Respect hard_header_len of device. 



Don't assume 16.

Found by Ben Greear.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e048a374

net/core/pktgen.c

+3 −2
Original line number Diff line number Diff line
@@ -1860,13 +1860,14 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, 
	 */

	mod_cur_headers(pkt_dev);



	skb = alloc_skb(pkt_dev->cur_pkt_size + 64 + 16, GFP_ATOMIC);

	datalen = (odev->hard_header_len + 16) & ~0xf;

	skb = alloc_skb(pkt_dev->cur_pkt_size + 64 + datalen, GFP_ATOMIC);

	if (!skb) {

		sprintf(pkt_dev->result, "No memory");

		return NULL;

	}



	skb_reserve(skb, 16);

	skb_reserve(skb, datalen);



	/*  Reserve for ethernet and IP header  */

	eth = (__u8 *) skb_push(skb, 14);