tipc: merge port message reception into socket reception function
authorJon Paul Maloy <jon.maloy@ericsson.com>
Wed, 14 May 2014 09:39:15 +0000 (05:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 14 May 2014 19:19:48 +0000 (15:19 -0400)
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>
net/tipc/link.c
net/tipc/net.c
net/tipc/port.c
net/tipc/port.h
net/tipc/socket.c
net/tipc/socket.h

diff --cc net/tipc/link.c
Simple merge
diff --cc net/tipc/net.c
Simple merge
diff --cc net/tipc/port.c
Simple merge
diff --cc net/tipc/port.h
Simple merge
Simple merge
Simple merge