summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-04-27 10:05:28 +0200
committerDavid S. Miller <davem@davemloft.net>2016-04-28 22:54:12 +0200
commitb43586576e54609f7970096478cf4113de18a4db (patch)
tree7f72b93db5130316fb3e8ad8398b09e228788944
parentnet/mlx5e: avoid stack overflow in mlx5e_open_channels (diff)
downloadlinux-b43586576e54609f7970096478cf4113de18a4db.tar.xz
linux-b43586576e54609f7970096478cf4113de18a4db.zip
tipc: remove an unnecessary NULL check
This is never called with a NULL "buf" and anyway, we dereference 's' on the lines before so it would Oops before we reach the check. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/subscr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 79de588c7bd6..0dd02244e21d 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -326,8 +326,7 @@ static void tipc_subscrb_rcv_cb(struct net *net, int conid,
return tipc_subscrp_cancel(s, subscriber);
}
- if (s)
- tipc_subscrp_subscribe(net, s, subscriber, swap);
+ tipc_subscrp_subscribe(net, s, subscriber, swap);
}
/* Handle one request to establish a new subscriber */