diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-03-24 15:24:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-24 15:24:39 -0400 |
| commit | f6bb76cd4d8552bada1e454c291419f893e1af7b (patch) | |
| tree | 5a3629c16df9092a65ace3583d7effd44f9ae698 /drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | |
| parent | ipv6: fix sparse warnings in privacy stable addresses generation (diff) | |
| parent | cxgb4: update Kconfig and Makefile for FCoE support (diff) | |
| download | linux-dev-f6bb76cd4d8552bada1e454c291419f893e1af7b.tar.xz linux-dev-f6bb76cd4d8552bada1e454c291419f893e1af7b.zip | |
Merge branch 'cxgb4-fcoe'
Varun Prakash says:
====================
FCoE support in cxgb4 driver
This patch series enables FCoE support in cxgb4 driver, it enables
FCOE_CRC and FCOE_MTU net device features.
This series is created against net-next tree.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index 4555634b985d..bf46ca935e2a 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -387,6 +387,10 @@ struct sge_rspq; #include "cxgb4_dcb.h" +#ifdef CONFIG_CHELSIO_T4_FCOE +#include "cxgb4_fcoe.h" +#endif /* CONFIG_CHELSIO_T4_FCOE */ + struct port_info { struct adapter *adapter; u16 viid; @@ -406,6 +410,9 @@ struct port_info { #ifdef CONFIG_CHELSIO_T4_DCB struct port_dcb_info dcb; /* Data Center Bridging support */ #endif +#ifdef CONFIG_CHELSIO_T4_FCOE + struct cxgb_fcoe fcoe; +#endif /* CONFIG_CHELSIO_T4_FCOE */ }; struct dentry; |