| commit | e951f145d1724769546efe2e04f6cb2b7037d7ea | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Aug 18 21:14:37 2016 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Aug 18 21:14:37 2016 -0700 |
| tree | 5be9dff97c6e466c0956df3a5bc1f60581f2758c | |
| parent | 37bd91d1d9a9a3ab5e8f7efedadc4ced5d2d0a3a [diff] | |
| parent | 5a0950c27236dc6f6a3e9d13259c1a2e89fd1cf7 [diff] |
Merge branch 'tipc-next' 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>