diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /net/ax25/ax25_in.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'net/ax25/ax25_in.c')
| -rw-r--r-- | net/ax25/ax25_in.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 79fef3dcb..dee4565ad 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c @@ -389,10 +389,9 @@ static int ax25_rcv(struct sk_buff *skb, struct device *dev, ax25_address *dev_a } ax25 = make->protinfo.ax25; - + skb_set_owner_r(skb, make); skb_queue_head(&sk->receive_queue, skb); - skb->sk = make; make->state = TCP_ESTABLISHED; make->pair = sk; @@ -473,6 +472,7 @@ static int ax25_rcv(struct sk_buff *skb, struct device *dev, ax25_address *dev_a int ax25_kiss_rcv(struct sk_buff *skb, struct device *dev, struct packet_type *ptype) { skb->sk = NULL; /* Initially we don't know who it's for */ + skb->destructor = NULL; /* Who initializes this, dammit?! */ if ((*skb->data & 0x0F) != 0) { kfree_skb(skb); /* Not a KISS data frame */ |