diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 23:13:42 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 23:13:42 +1000 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /net/core/netpoll.c | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
| download | kernel-crypto-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.tar.gz kernel-crypto-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.tar.xz kernel-crypto-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.zip | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index b04d643fc3c..8fb134da034 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -419,7 +419,7 @@ static void arp_reply(struct sk_buff *skb) return; size = arp_hdr_len(skb->dev); - send_skb = find_skb(np, size + LL_RESERVED_SPACE(np->dev), + send_skb = find_skb(np, size + LL_ALLOCATED_SPACE(np->dev), LL_RESERVED_SPACE(np->dev)); if (!send_skb) |