diff options
| author | Bogdan Hamciuc <bogdan.hamciuc@freescale.com> | 2013-04-05 08:33:57 (GMT) |
|---|---|---|
| committer | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-04-08 23:22:12 (GMT) |
| commit | 5e0b3c3b9fcd5f284c0677ce9cc1bd892fd134f1 (patch) | |
| tree | 4390bf532f6383fb4499bb63793c4bec91cb76c5 /drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c | |
| parent | 7bc7300b2efa1c4935acfaf63e229711745db07c (diff) | |
| download | linux-fsl-qoriq-5e0b3c3b9fcd5f284c0677ce9cc1bd892fd134f1.tar.xz | |
dpaa_eth: Optionally disable ndo_select_queue in favor of XPS
The existence of a ndo_select_queue() callback overrides the XPS
selection logic on the egress path. Provide a Kconfig choice of
disabling this callback, to allow the standard XPS selection logic and
user-controlled FQ-to-CPU mapping.
In addition, if XPS is chosen, use the queue from
skb->queue_mapping for transmission.
Signed-off-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com>
(cherry picked from commit a6320761e50dab577d9668ac0c09bde67aa36585)
Conflicts:
drivers/net/ethernet/freescale/dpa/dpaa_eth.c
Change-Id: Ib0e5919a957975cd9a33d1886b27789ff5abd71f
Reviewed-on: http://git.am.freescale.net:8181/1049
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c index cabf9dc..09b2928 100644 --- a/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c +++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth_sg.c @@ -717,7 +717,7 @@ int __hot dpa_tx(struct sk_buff *skb, struct net_device *net_dev) clear_fd(&fd); - queue_mapping = smp_processor_id(); + queue_mapping = dpa_get_queue_mapping(skb); #ifdef CONFIG_FSL_DPA_1588 |