diff options
| author |   Jon Paul Maloy <jon.maloy@ericsson.com> | 2014-05-14 05:39:15 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-05-14 15:19:48 -0400 |
| commit | 9816f0615d549b948a76e6d2385159b4366e4658 (patch) | |
| tree | 6384a917346902a5916789cdea9d3a18e47f53a6 /net/tipc/net.c | |
| parent | tipc: clean up neigbor discovery message reception (diff) | |
| download | linux-dev-9816f0615d549b948a76e6d2385159b4366e4658.tar.xz linux-dev-9816f0615d549b948a76e6d2385159b4366e4658.zip | |
tipc: merge port message reception into socket reception function
In order to reduce complexity and save a call level during message
reception at port/socket level, we remove the function tipc_port_rcv()
and merge its functionality into tipc_sk_rcv().
Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/net.c')
| -rw-r--r-- | net/tipc/net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index f8fc95d58c0d..f64375e7f99f 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -39,6 +39,7 @@ #include "name_distr.h" #include "subscr.h" #include "port.h" +#include "socket.h" #include "node.h" #include "config.h" @@ -141,7 +142,7 @@ void tipc_net_route_msg(struct sk_buff *buf) if (msg_mcast(msg)) tipc_port_mcast_rcv(buf, NULL); else if (msg_destport(msg)) - tipc_port_rcv(buf); + tipc_sk_rcv(buf); else net_route_named_msg(buf); return; |