diff options
| author | David S. Miller | 2015-11-03 19:41:45 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-11-03 19:41:45 +0100 |
| commit | 73186df8d7fa574345f0ad626ebe89649f8308a5 (patch) | |
| tree | 9e6ed2c499cb5cbbcc79415602f9114503bb6931 /include | |
| parent | switchdev: respect SKIP_EOPNOTSUPP flag in case there is no recursion (diff) | |
| parent | ipv6: fix tunnel error handling (diff) | |
| download | kernel-qcow2-linux-73186df8d7fa574345f0ad626ebe89649f8308a5.tar.gz kernel-qcow2-linux-73186df8d7fa574345f0ad626ebe89649f8308a5.tar.xz kernel-qcow2-linux-73186df8d7fa574345f0ad626ebe89649f8308a5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/inet_common.h | 3 | ||||
| -rw-r--r-- | include/net/ip_fib.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/inet_common.h b/include/net/inet_common.h index 279f83591971..109e3ee9108c 100644 --- a/include/net/inet_common.h +++ b/include/net/inet_common.h @@ -41,7 +41,8 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, static inline void inet_ctl_sock_destroy(struct sock *sk) { - sock_release(sk->sk_socket); + if (sk) + sock_release(sk->sk_socket); } #endif diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index ac5c6e80586a..9f4df68105ab 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -317,7 +317,7 @@ void fib_flush_external(struct net *net); /* Exported by fib_semantics.c */ int ip_fib_check_default(__be32 gw, struct net_device *dev); -int fib_sync_down_dev(struct net_device *dev, unsigned long event); +int fib_sync_down_dev(struct net_device *dev, unsigned long event, bool force); int fib_sync_down_addr(struct net *net, __be32 local); int fib_sync_up(struct net_device *dev, unsigned int nh_flags); |