---

yaml --- r: 18869 b: refs/heads/master c: 7ac5459 h: refs/heads/master i: 18867: 8c34604 v: v3
git-mirror · Jan 18, 2006 · 8cc2fab · 8cc2fab
1 parent 795d9ae
commit 8cc2fab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e048a374d0d7beb9cf3529eac71ddd79699c8669
+refs/heads/master: 7ac5459ec0f074022818af35c589b9e2b406d7c3
diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
@@ -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);