diff options
author | David S. Miller <davem@davemloft.net> | 2013-10-08 23:07:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-08 23:07:53 -0400 |
commit | 53af53ae83fe960ceb9ef74cac7915e9088f4266 (patch) | |
tree | 0cd5309f2a931d3f210aa3d2025aae64f2276e8c /include/net/sock.h | |
parent | b343ca84b4e3ba65508503333c923a797801a588 (diff) | |
parent | 9684d7b0dab3cf3a897edd85dca501d413888d56 (diff) | |
download | linux-stable-53af53ae83fe960ceb9ef74cac7915e9088f4266.tar.gz linux-stable-53af53ae83fe960ceb9ef74cac7915e9088f4266.tar.bz2 linux-stable-53af53ae83fe960ceb9ef74cac7915e9088f4266.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/linux/netdevice.h
net/core/sock.c
Trivial merge issues.
Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.
Two parallel line additions in net/core/sock.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 79532540201b..7cf8d2331afb 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1612,16 +1612,14 @@ static inline void sk_filter_release(struct sk_filter *fp) static inline void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp) { - unsigned int size = sk_filter_len(fp); - - atomic_sub(size, &sk->sk_omem_alloc); + atomic_sub(sk_filter_size(fp->len), &sk->sk_omem_alloc); sk_filter_release(fp); } static inline void sk_filter_charge(struct sock *sk, struct sk_filter *fp) { atomic_inc(&fp->refcnt); - atomic_add(sk_filter_len(fp), &sk->sk_omem_alloc); + atomic_add(sk_filter_size(fp->len), &sk->sk_omem_alloc); } /* |