diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 17:19:10 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-18 17:19:10 -0500 |
commit | 7ac5459ec0f074022818af35c589b9e2b406d7c3 (patch) | |
tree | 2b623adcfcce2185b60b1aceed01f3a68b471f4e /net | |
parent | e048a374d0d7beb9cf3529eac71ddd79699c8669 (diff) |
[PKTGEN]: Respect hard_header_len of device.
Don't assume 16.
Found by Ben Greear.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/pktgen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 3827f881f429..da16f8fd1494 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -1860,13 +1860,14 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, | |||
1860 | */ | 1860 | */ |
1861 | mod_cur_headers(pkt_dev); | 1861 | mod_cur_headers(pkt_dev); |
1862 | 1862 | ||
1863 | skb = alloc_skb(pkt_dev->cur_pkt_size + 64 + 16, GFP_ATOMIC); | 1863 | datalen = (odev->hard_header_len + 16) & ~0xf; |
1864 | skb = alloc_skb(pkt_dev->cur_pkt_size + 64 + datalen, GFP_ATOMIC); | ||
1864 | if (!skb) { | 1865 | if (!skb) { |
1865 | sprintf(pkt_dev->result, "No memory"); | 1866 | sprintf(pkt_dev->result, "No memory"); |
1866 | return NULL; | 1867 | return NULL; |
1867 | } | 1868 | } |
1868 | 1869 | ||
1869 | skb_reserve(skb, 16); | 1870 | skb_reserve(skb, datalen); |
1870 | 1871 | ||
1871 | /* Reserve for ethernet and IP header */ | 1872 | /* Reserve for ethernet and IP header */ |
1872 | eth = (__u8 *) skb_push(skb, 14); | 1873 | eth = (__u8 *) skb_push(skb, 14); |