diff options
| author | Kumar Sanghvi | 2014-02-18 13:26:10 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-02-18 22:23:00 +0100 |
| commit | 57d8b7649d119e8ad6a976a196a21cb4e5e2714c (patch) | |
| tree | e216356ed987000bd75f6a6968ae516db6158b8c /drivers/net/ethernet/chelsio | |
| parent | cxgb4: Print adapter VPD Part Number instead of Engineering Change field (diff) | |
| download | kernel-qcow2-linux-57d8b7649d119e8ad6a976a196a21cb4e5e2714c.tar.gz kernel-qcow2-linux-57d8b7649d119e8ad6a976a196a21cb4e5e2714c.tar.xz kernel-qcow2-linux-57d8b7649d119e8ad6a976a196a21cb4e5e2714c.zip | |
cxgb4: Allow >10G ports to have multiple queues
Based on original work by Divy Le Ray.
Signed-off-by: Kumar Sanghvi <kumaras@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 809685d748f2..9222a8a8eec7 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -5614,9 +5614,10 @@ static const struct pci_error_handlers cxgb4_eeh = { .resume = eeh_resume, }; -static inline bool is_10g_port(const struct link_config *lc) +static inline bool is_x_10g_port(const struct link_config *lc) { - return (lc->supported & FW_PORT_CAP_SPEED_10G) != 0; + return (lc->supported & FW_PORT_CAP_SPEED_10G) != 0 || + (lc->supported & FW_PORT_CAP_SPEED_40G) != 0; } static inline void init_rspq(struct sge_rspq *q, u8 timer_idx, u8 pkt_cnt_idx, @@ -5640,7 +5641,7 @@ static void cfg_queues(struct adapter *adap) int i, q10g = 0, n10g = 0, qidx = 0; for_each_port(adap, i) - n10g += is_10g_port(&adap2pinfo(adap, i)->link_cfg); + n10g += is_x_10g_port(&adap2pinfo(adap, i)->link_cfg); /* * We default to 1 queue per non-10G port and up to # of cores queues @@ -5655,7 +5656,7 @@ static void cfg_queues(struct adapter *adap) struct port_info *pi = adap2pinfo(adap, i); pi->first_qset = qidx; - pi->nqsets = is_10g_port(&pi->link_cfg) ? q10g : 1; + pi->nqsets = is_x_10g_port(&pi->link_cfg) ? q10g : 1; qidx += pi->nqsets; } |