Jon Maloy 36c0a9dfc6 tipc: fix rebasing error ...

In commit 2f487712b8 ("tipc: guarantee that group broadcast doesn't
bypass group unicast") there was introduced a last-minute rebasing
error that broke non-group communication.

We fix this here.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2017-10-16 21:28:36 +01:00

..

addr.c

…

addr.h

…

bcast.c

tipc: improve destination linked list

2017-10-13 08:46:00 -07:00

bcast.h

…

bearer.c

tipc: remove unnecessary call to dev_net()

2017-09-06 21:25:52 -07:00

bearer.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-09-01 17:42:05 -07:00

core.c

…

core.h

tipc: add ability to order and receive topology events in driver

2017-10-13 08:46:00 -07:00

discover.c

…

discover.h

…

eth_media.c

…

group.c

tipc: add multipoint-to-point flow control

2017-10-13 08:46:01 -07:00

group.h

tipc: guarantee that group broadcast doesn't bypass group unicast

2017-10-13 08:46:01 -07:00

ib_media.c

…

Kconfig

…

link.c

tipc: fix rebasing error

2017-10-16 21:28:36 +01:00

link.h

…

Makefile

tipc: introduce communication groups

2017-10-13 08:46:00 -07:00

monitor.c

…

monitor.h

…

msg.c

tipc: refactor function filter_rcv()

2017-10-13 08:46:00 -07:00

msg.h

tipc: add multipoint-to-point flow control

2017-10-13 08:46:01 -07:00

name_distr.c

…

name_distr.h

…

name_table.c

tipc: introduce group anycast messaging

2017-10-13 08:46:00 -07:00

name_table.h

tipc: introduce group anycast messaging

2017-10-13 08:46:00 -07:00

net.c

netlink: pass extended ACK struct where available

2017-04-13 13:58:22 -04:00

net.h

…

netlink_compat.c

net: tipc: constify genl_ops

2017-08-23 22:31:38 -07:00

netlink.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

netlink.h

…

node.c

tipc: add new function for sending multiple small messages

2017-10-13 08:46:00 -07:00

node.h

tipc: introduce communication groups

2017-10-13 08:46:00 -07:00

server.c

tipc: add ability to order and receive topology events in driver

2017-10-13 08:46:00 -07:00

server.h

tipc: add ability to order and receive topology events in driver

2017-10-13 08:46:00 -07:00

socket.c

tipc: guarantee delivery of UP event before first broadcast

2017-10-13 08:46:01 -07:00

socket.h

…

subscr.c

tipc: fix a race condition of releasing subscriber object

2017-08-22 14:25:02 -07:00

subscr.h

tipc: adjust the policy of holding subscription kref

2017-03-28 18:03:33 -07:00

sysctl.c

…

udp_media.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

udp_media.h

…