4 files changed, 5 insertions, 8 deletions

diff --git a/net/tipc/link.c b/net/tipc/link.c
index 85ad5c0678d0..341ecd796aa4 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1126,7 +1126,7 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,
                         skb_queue_tail(mc_inputq, skb);
                         return true;
                 }
-                /* else: fall through */
+                /* fall through */
         case CONN_MANAGER:
                 skb_queue_tail(inputq, skb);
                 return true;
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 70343ac448b1..e482b342bfa8 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -737,7 +737,7 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
         case TIPC_CONNECTING:
                 if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk))
                         revents |= EPOLLOUT;
-                /* fall thru' */
+                /* fall through */
         case TIPC_LISTEN:
                 if (!skb_queue_empty(&sk->sk_receive_queue))
                         revents |= EPOLLIN | EPOLLRDNORM;
@@ -2421,7 +2421,7 @@ static int tipc_connect(struct socket *sock, struct sockaddr *dest,
                  * case is EINPROGRESS, rather than EALREADY.
                  */
                 res = -EINPROGRESS;
-                /* fall thru' */
+                /* fall through */
         case TIPC_CONNECTING:
                 if (!timeout) {
                         if (previous == TIPC_CONNECTING)
diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c
index a457c0fbbef1..4a708a4e8583 100644
--- a/net/tipc/topsrv.c
+++ b/net/tipc/topsrv.c
@@ -60,7 +60,6 @@
  * @awork: accept work item
  * @rcv_wq: receive workqueue
  * @send_wq: send workqueue
- * @max_rcvbuf_size: maximum permitted receive message length
  * @listener: topsrv listener socket
  * @name: server name
  */
@@ -72,7 +71,6 @@ struct tipc_topsrv {
         struct work_struct awork;
         struct workqueue_struct *rcv_wq;
         struct workqueue_struct *send_wq;
-        int max_rcvbuf_size;
         struct socket *listener;
         char name[TIPC_SERVER_NAME_LEN];
 };
@@ -648,7 +646,6 @@ int tipc_topsrv_start(struct net *net)
                 return -ENOMEM;
 
         srv->net = net;
-        srv->max_rcvbuf_size = sizeof(struct tipc_subscr);
         INIT_WORK(&srv->awork, tipc_topsrv_accept);
 
         strscpy(srv->name, name, sizeof(srv->name));
diff --git a/net/tipc/trace.c b/net/tipc/trace.c
index 964823841efe..265f6a26aa3d 100644
--- a/net/tipc/trace.c
+++ b/net/tipc/trace.c
@@ -111,7 +111,7 @@ int tipc_skb_dump(struct sk_buff *skb, bool more, char *buf)
                         break;
                 default:
                         break;
-                };
+                }
                 i += scnprintf(buf + i, sz - i, " | %u",
                                msg_src_droppable(hdr));
                 i += scnprintf(buf + i, sz - i, " %u",
@@ -122,7 +122,7 @@ int tipc_skb_dump(struct sk_buff *skb, bool more, char *buf)
         default:
                 /* need more? */
                 break;
-        };
+        }
 
         i += scnprintf(buf + i, sz - i, "\n");
         if (!more)