diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /include/net/sock.h | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index cc9d5bcb06f7..4bb1ff9fd15b 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -867,7 +867,6 @@ static inline void sk_mem_uncharge(struct sock *sk, int size) | |||
| 867 | 867 | ||
| 868 | static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) | 868 | static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) |
| 869 | { | 869 | { |
| 870 | skb_truesize_check(skb); | ||
| 871 | sock_set_flag(sk, SOCK_QUEUE_SHRUNK); | 870 | sock_set_flag(sk, SOCK_QUEUE_SHRUNK); |
| 872 | sk->sk_wmem_queued -= skb->truesize; | 871 | sk->sk_wmem_queued -= skb->truesize; |
| 873 | sk_mem_uncharge(sk, skb->truesize); | 872 | sk_mem_uncharge(sk, skb->truesize); |