Merge branch 'tipc-next'

Browse source

Jon Maloy says:

====================
tipc: bearer and link improvements

The first commit makes it possible to set and check the 'blocked' state
of a bearer from the generic bearer layer. The second commit is a small
improvement to the link congestion mechanism.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2016-08-18 21:14:37 -07:00

parent 37bd91d1d9 5a0950c272

commit e951f145d1

4 changed files with 52 additions and 47 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

78

net/tipc/bearer.c

View file

1

net/tipc/bearer.h

View file

18

net/tipc/link.c

View file

2

net/tipc/udp_media.c

View file