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

In commit 2f487712b893 ("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

tipc: simplify include dependencies

2015-05-14 12:24:45 -04:00

addr.h

tipc: introduce constants for tipc address validation

2016-07-26 14:26:42 -07:00

bcast.c

tipc: improve destination linked list

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

bcast.h

tipc: make replicast a user selectable option

2017-01-20 12:10:17 -05:00

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

netns: make struct pernet_operations::id unsigned int

2016-11-18 10:59:15 -05:00

core.h

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

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

discover.c

tipc: allocate user memory with GFP_KERNEL flag

2017-01-16 13:31:53 -05:00

discover.h

tipc: eliminate buffer leak in bearer layer

2016-04-07 17:00:13 -04:00

eth_media.c

tipc: make media address offset a common define

2015-02-27 18:18:48 -05:00

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

tipc: rename media/msg related definitions

2015-02-27 18:18:48 -05:00

Kconfig

tipc: add ip/udp media type

2015-03-05 22:08:42 -05:00

link.c

tipc: fix rebasing error

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

link.h

tipc: transfer broadcast nacks in link state messages

2016-09-02 17:10:24 -07:00

Makefile

tipc: introduce communication groups

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

monitor.c

tipc: improve sanity check for received domain records

2016-11-25 20:06:18 -05:00

monitor.h

tipc: dump monitor attributes

2016-07-26 14:26:42 -07:00

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

tipc: allocate user memory with GFP_KERNEL flag

2017-01-16 13:31:53 -05:00

name_distr.h

tipc: reduce code dependency between binding table and node layer

2015-11-20 14:06:10 -05:00

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

tipc: add peer removal functionality

2016-08-18 23:36:07 -07:00

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

tipc: make cluster size threshold for monitoring configurable

2016-07-26 14:26:42 -07:00

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

tipc: redesign connection-level flow control

2016-05-03 15:51:16 -04:00

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

tipc: add name distributor resiliency queue

2014-09-01 17:51:48 -07:00

udp_media.c

netlink: pass extended ACK struct to parsing functions

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

udp_media.h

tipc: add UDP remoteip dump to netlink API

2016-08-26 21:38:41 -07:00