diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-08-18 21:14:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-18 21:14:37 -0700 |
| commit | e951f145d1724769546efe2e04f6cb2b7037d7ea (patch) | |
| tree | 5be9dff97c6e466c0956df3a5bc1f60581f2758c /net/sched/sch_api.c | |
| parent | Merge branch 'qed-next' (diff) | |
| parent | tipc: ensure that link congestion and wakeup use same criteria (diff) | |
| download | linux-dev-e951f145d1724769546efe2e04f6cb2b7037d7ea.tar.xz linux-dev-e951f145d1724769546efe2e04f6cb2b7037d7ea.zip | |
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>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions