diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:22:13 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:22:13 -0500 |
| commit | 4434e5156409eb3ec98f5ad7f0a0c07ebafe970d (patch) | |
| tree | c7f148cdae7a6cf4013253c6c2dbd1c49e837e32 /include/net/sock.h | |
| parent | 2b8f836fb196acede88b6cc772e9057e0a9c0223 (diff) | |
| parent | 694593e3374a67d95ece6a275a1f181644c2c4d8 (diff) | |
Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core
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 ce3b5b622683..eefeeaf7fc46 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -860,7 +860,6 @@ static inline void sk_mem_uncharge(struct sock *sk, int size) | |||
| 860 | 860 | ||
| 861 | static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) | 861 | static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) |
| 862 | { | 862 | { |
| 863 | skb_truesize_check(skb); | ||
| 864 | sock_set_flag(sk, SOCK_QUEUE_SHRUNK); | 863 | sock_set_flag(sk, SOCK_QUEUE_SHRUNK); |
| 865 | sk->sk_wmem_queued -= skb->truesize; | 864 | sk->sk_wmem_queued -= skb->truesize; |
| 866 | sk_mem_uncharge(sk, skb->truesize); | 865 | sk_mem_uncharge(sk, skb->truesize); |