Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0980c1e3 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: use C99 initializers in new_state[] 



Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80f03e27

net/ipv4/tcp.c

+13 −12
Original line number Diff line number Diff line
@@ -1913,18 +1913,19 @@ EXPORT_SYMBOL_GPL(tcp_set_state); 


static const unsigned char new_state[16] = {

  /* current state:        new state:      action:	*/

  /* (Invalid)		*/ TCP_CLOSE,

  /* TCP_ESTABLISHED	*/ TCP_FIN_WAIT1 | TCP_ACTION_FIN,

  /* TCP_SYN_SENT	*/ TCP_CLOSE,

  /* TCP_SYN_RECV	*/ TCP_FIN_WAIT1 | TCP_ACTION_FIN,

  /* TCP_FIN_WAIT1	*/ TCP_FIN_WAIT1,

  /* TCP_FIN_WAIT2	*/ TCP_FIN_WAIT2,

  /* TCP_TIME_WAIT	*/ TCP_CLOSE,

  /* TCP_CLOSE		*/ TCP_CLOSE,

  /* TCP_CLOSE_WAIT	*/ TCP_LAST_ACK  | TCP_ACTION_FIN,

  /* TCP_LAST_ACK	*/ TCP_LAST_ACK,

  /* TCP_LISTEN		*/ TCP_CLOSE,

  /* TCP_CLOSING	*/ TCP_CLOSING,

  [0 /* (Invalid) */]	= TCP_CLOSE,

  [TCP_ESTABLISHED]	= TCP_FIN_WAIT1 | TCP_ACTION_FIN,

  [TCP_SYN_SENT]	= TCP_CLOSE,

  [TCP_SYN_RECV]	= TCP_FIN_WAIT1 | TCP_ACTION_FIN,

  [TCP_FIN_WAIT1]	= TCP_FIN_WAIT1,

  [TCP_FIN_WAIT2]	= TCP_FIN_WAIT2,

  [TCP_TIME_WAIT]	= TCP_CLOSE,

  [TCP_CLOSE]		= TCP_CLOSE,

  [TCP_CLOSE_WAIT]	= TCP_LAST_ACK  | TCP_ACTION_FIN,

  [TCP_LAST_ACK]	= TCP_LAST_ACK,

  [TCP_LISTEN]		= TCP_CLOSE,

  [TCP_CLOSING]		= TCP_CLOSING,

  [TCP_NEW_SYN_RECV]	= TCP_CLOSE,	/* should not happen ! */

};



static int tcp_close_state(struct sock *sk)