diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /net/appletalk | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'net/appletalk')
| -rw-r--r-- | net/appletalk/ddp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index e2012cbb3..896bc9384 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1607,8 +1607,12 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_ * Note. ddp-> becomes invalid at the realloc. */ if (skb_headroom(skb) < 22) + { + struct sk_buff *newskb; /* 22 bytes - 12 ether, 2 len, 3 802.2 5 snap */ - skb = skb_realloc_headroom(skb, 32); + newskb = skb_realloc_headroom(skb, 32); + kfree(skb); + } else skb = skb_unshare(skb, GFP_ATOMIC); |