Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 121721
b: refs/heads/master
c: 270acef
h: refs/heads/master
i:
  121719: f16019f
v: v3
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Nov 5, 2008
1 parent 8b04d02 commit 052939f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d99a7bd210a14001007fc5233597c78877f0a11c
refs/heads/master: 270acefafeb74ce2fe93d35b75733870bf1e11e7
5 changes: 2 additions & 3 deletions trunk/net/core/datagram.c
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
void skb_free_datagram(struct sock *sk, struct sk_buff *skb)
{
kfree_skb(skb);
sk_mem_reclaim(sk);
sk_mem_reclaim_partial(sk);
}

/**
Expand Down Expand Up @@ -248,8 +248,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
spin_unlock_bh(&sk->sk_receive_queue.lock);
}

kfree_skb(skb);
sk_mem_reclaim(sk);
skb_free_datagram(sk, skb);
return err;
}

Expand Down

0 comments on commit 052939f

Please sign in to comment.