diff options
| author |   Jon Maloy <jon.maloy@ericsson.com> | 2017-10-16 16:04:51 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-10-16 21:28:36 +0100 |
| commit | 36c0a9dfc6613242ba1de012e2d15145cdaae805 (patch) | |
| tree | 6a4c5a4d6c49adadb3660638f9a30e8a72cf215e /net/lapb/lapb_timer.c | |
| parent | Merge branch 'net-core-rcuify-rtnl-af_ops' (diff) | |
| download | wireguard-linux-36c0a9dfc6613242ba1de012e2d15145cdaae805.tar.xz wireguard-linux-36c0a9dfc6613242ba1de012e2d15145cdaae805.zip | |
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>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions