Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[mirror_ubuntu-bionic-kernel.git] / net / x25 / x25_in.c

diff --git a/net/x25/x25_in.c b/net/x25/x25_in.c
index 7ac50098a375427bb482e5e73803bc7b34adc6f9..3c12cae32001da306a97cae51979118931360056 100644 (file)
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -345,6 +345,7 @@ static int x25_state4_machine(struct sock *sk, struct sk_buff *skb, int frametyp
 
                case X25_RESET_REQUEST:
                        x25_write_internal(sk, X25_RESET_CONFIRMATION);
+                       /* fall through */
                case X25_RESET_CONFIRMATION: {
                        x25_stop_timer(sk);
                        x25->condition = 0x00;