summaryrefslogtreecommitdiffstats
path: root/net/appletalk
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
commit1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch)
tree141e31f89f18b9fe0831f31852e0435ceaccafc5 /net/appletalk
parentfb9c690a18b3d66925a65b17441c37fa14d4370b (diff)
Merge with 2.4.0-test7.
Diffstat (limited to 'net/appletalk')
-rw-r--r--net/appletalk/ddp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 4fca72a84..260a5e530 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1611,7 +1611,10 @@ static int atalk_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_
struct sk_buff *newskb;
/* 22 bytes - 12 ether, 2 len, 3 802.2 5 snap */
newskb = skb_realloc_headroom(skb, 32);
- kfree(skb);
+ kfree_skb(skb);
+ if (!newskb)
+ return 0;
+ skb = newskb;
}
else
skb = skb_unshare(skb, GFP_ATOMIC);