projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
net
/
tipc
/
subscr.c
diff --git
a/net/tipc/subscr.c
b/net/tipc/subscr.c
index 22963cafd5ede27d59ecb772d1cd5c4257cacb98..e6cb386fbf3469017f805e5db135d04b86a30d78 100644
(file)
--- a/
net/tipc/subscr.c
+++ b/
net/tipc/subscr.c
@@
-326,7
+326,8
@@
static void tipc_subscrb_rcv_cb(struct net *net, int conid,
return tipc_subscrp_cancel(s, subscriber);
}
- tipc_subscrp_subscribe(net, s, subscriber, swap);
+ if (s)
+ tipc_subscrp_subscribe(net, s, subscriber, swap);
}
/* Handle one request to establish a new subscriber */