summaryrefslogtreecommitdiffstats
path: root/net/tipc/link.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-14 10:08:57 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-14 10:08:57 +0200
commit9ef8638bd8c7e06bee087a04af7950cbc6123828 (patch)
treede145994dfe036dbd2d729c61e043f1a96cef25c /net/tipc/link.c
parentplatform_device: switch to simpler IDA interface (diff)
parentLinux 5.9-rc5 (diff)
downloadlinux-9ef8638bd8c7e06bee087a04af7950cbc6123828.tar.xz
linux-9ef8638bd8c7e06bee087a04af7950cbc6123828.zip
Merge 5.9-rc5 into driver-core-next
We need the driver core changes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/tipc/link.c')
-rw-r--r--net/tipc/link.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 107578122973..b7362556da95 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1239,7 +1239,7 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,
skb_queue_tail(mc_inputq, skb);
return true;
}
- /* fall through */
+ fallthrough;
case CONN_MANAGER:
skb_queue_tail(inputq, skb);
return true;