diff options
| author | Bogdan Hamciuc <bogdan.hamciuc@freescale.com> | 2013-03-25 09:32:06 (GMT) |
|---|---|---|
| committer | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-04-16 21:01:49 (GMT) |
| commit | e5d18e508a10cb25739533919ba0898ddfd3b17c (patch) | |
| tree | 850a75c3f693bf5613b36fa7b8f64256df8d2163 /net/core | |
| parent | 5c641f51cfe16b808e3fd4fcb4580707236ec5e6 (diff) | |
| download | linux-fsl-qoriq-e5d18e508a10cb25739533919ba0898ddfd3b17c.tar.xz | |
dpaa_eth: Remove NETIF_F_HW_QDISC from standard capability set
Due to opposition from the kernel netdevs, unstaging the Hw Qdisc as a
standard capability and moving it to ASF instead.
Change-Id: I79592b273eac12650d6dab1662a5901725a9c5a9
Signed-off-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/1281
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 619a00e..29aab09 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2674,11 +2674,13 @@ int dev_queue_xmit(struct sk_buff *skb) skb_update_prio(skb); txq = netdev_pick_tx(dev, skb); +#ifdef CONFIG_AS_FASTPATH if ((dev->features & NETIF_F_HW_QDISC) && likely(!netif_tx_queue_stopped(txq))) { rc = dev_hard_start_xmit(skb, dev, txq); goto out; } +#endif q = rcu_dereference_bh(txq->qdisc); #ifdef CONFIG_NET_CLS_ACT |