Commit 8695a144 authored by Raanan Avargil's avatar Raanan Avargil Committed by David S. Miller
Browse files

tcp/dccp: fix old style declarations



I’m using the compilation flag -Werror=old-style-declaration, which
requires that the “inline” word would come at the beginning of the code
line.

$ make drivers/net/ethernet/intel/e1000e/e1000e.ko
...
include/net/inet_timewait_sock.h:116:1: error: ‘inline’ is not at
beginning of declaration [-Werror=old-style-declaration]
static void inline inet_twsk_schedule(struct inet_timewait_sock *tw, int
timeo)

include/net/inet_timewait_sock.h:121:1: error: ‘inline’ is not at
beginning of declaration [-Werror=old-style-declaration]
static void inline inet_twsk_reschedule(struct inet_timewait_sock *tw,
int timeo)

Fixes: ed2e9239 ("tcp/dccp: fix timewait races in timer handling")
Signed-off-by: default avatarRaanan Avargil <raanan.avargil@intel.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33a8316d
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -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,
void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo,
			  bool rearm);
			  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);
	__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);
	__inet_twsk_schedule(tw, timeo, true);
}
}