diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-21 11:11:12 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-21 11:11:12 -0800 |
| commit | bfccd95e7aba73d0d3154912b17b855cb9938c50 (patch) | |
| tree | 3250b7806b873170a3ff7dba0aa1664e57c5bde9 /net/sched/sch_api.c | |
| parent | 252ca494ac75f0dc47469f130d6dc67ed14081f4 (diff) | |
| parent | 4ef7675344d687a0ef5b0d7c0cee12da005870c0 (diff) | |
Merge 4.4-rc6 into usb-next
We want the USB and PHY fixes in here as well to make things easier for
testing and development.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sched/sch_api.c')
| -rw-r--r-- | net/sched/sch_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 7ec667dd4ce1..b5c2cf2aa6d4 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -950,7 +950,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, } lockdep_set_class(qdisc_lock(sch), &qdisc_tx_lock); if (!netif_is_multiqueue(dev)) - sch->flags |= TCQ_F_ONETXQUEUE | TCQ_F_NOPARENT; + sch->flags |= TCQ_F_ONETXQUEUE; } sch->handle = handle; |