diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 16:50:09 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 16:50:58 +0300 |
| commit | 7d6aa9ba4f8228c75970fc4fad27194611a548a6 (patch) | |
| tree | 4bbd64f6671391d6d93c1a1806ffec005114524e /drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | |
| parent | 1ee7826ab68f7e9fa1a01533983acf6a6f62e297 (diff) | |
| parent | fe23d63422c83cd7c8154dc7faef6af97be4b948 (diff) | |
| download | linux-7d6aa9ba4f8228c75970fc4fad27194611a548a6.tar.xz | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging to get the mac80211 updates that have since propagated
into net-next.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/cxgb4.h')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h index eda8e1269551..8b7d156f79d3 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h @@ -515,6 +515,7 @@ struct link_config { enum cc_pause requested_fc; /* flow control user has requested */ enum cc_pause fc; /* actual link flow control */ + enum cc_pause advertised_fc; /* actual advertised flow control */ enum cc_fec requested_fec; /* Forward Error Correction: */ enum cc_fec fec; /* requested and actual in use */ |