diff options
| author | Anish Bhatt | 2014-08-08 01:14:03 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-08-08 01:18:55 +0200 |
| commit | 10b0046685ab410847f420d740acf604c8cb4eec (patch) | |
| tree | 9701e13839a8cb4289eb6fbf404373f5b39009e0 /drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | |
| parent | net: ucc_geth: Don't use the MAC as PHY without a fixed link (diff) | |
| download | kernel-qcow2-linux-10b0046685ab410847f420d740acf604c8cb4eec.tar.gz kernel-qcow2-linux-10b0046685ab410847f420d740acf604c8cb4eec.tar.xz kernel-qcow2-linux-10b0046685ab410847f420d740acf604c8cb4eec.zip | |
cxgb4: IEEE fixes for DCBx state machine
* Changes required due to 16eecd9be4b05 ("dcbnl : Fix misleading
dcb_app->priority explanation")
* Driver was previously not aware of what DCBx version was negotiated by
firmware, this could lead to DCB app table in kernel or in firmware being
populated wrong since IEEE/CEE used different formats made clear by above
mentioned commit
* Driver was missing a couple of state transitions that could be caused
by other drivers that use chelsio hardware, resulting in incorrect behaviour
(the change that addresses this also flips the state machine to switch on
state instead of transition, hope this is okay in current window)
* Prio queue info & tsa is no longer thrown away
v2: Print DCBx state transition messages only when debug is enabled
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/cxgb4.h')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index cc42ab3cb2e7..d57282172ea5 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -522,6 +522,9 @@ struct sge_txq { struct sge_eth_txq { /* state for an SGE Ethernet Tx queue */ struct sge_txq q; struct netdev_queue *txq; /* associated netdev TX queue */ +#ifdef CONFIG_CHELSIO_T4_DCB + u8 dcb_prio; /* DCB Priority bound to queue */ +#endif unsigned long tso; /* # of TSO requests */ unsigned long tx_cso; /* # of Tx checksum offloads */ unsigned long vlan_ins; /* # of Tx VLAN insertions */ |