diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-20 16:08:27 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-20 16:08:27 +0300 |
| commit | 26440c835f8b1a491e2704118ac55bf87334366c (patch) | |
| tree | 3c2d23b59fd49b252fdbf6c09efc41b354933fc6 /include/net/inet_timewait_sock.h | |
| parent | 371f1c7e0d854796adc622cc3bacfcc5fc638db1 (diff) | |
| parent | 1099f86044111e9a7807f09523e42d4c9d0fb781 (diff) | |
| download | linux-26440c835f8b1a491e2704118ac55bf87334366c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/asix_common.c
net/ipv4/inet_connection_sock.c
net/switchdev/switchdev.c
In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.
The other two conflicts were overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_timewait_sock.h')
| -rw-r--r-- | include/net/inet_timewait_sock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index e581fc69129d..c9b3eb70f340 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h @@ -113,12 +113,12 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk, void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo, bool rearm); -static void inline inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo) +static inline void inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo) { __inet_twsk_schedule(tw, timeo, false); } -static void inline inet_twsk_reschedule(struct inet_timewait_sock *tw, int timeo) +static inline void inet_twsk_reschedule(struct inet_timewait_sock *tw, int timeo) { __inet_twsk_schedule(tw, timeo, true); } |