diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-20 19:27:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-20 19:27:57 -0700 |
| commit | de1b99ef2aa1e982c86b15853e013c6e3dbc1e7a (patch) | |
| tree | 14a2563a6fee380410ecb6a8f9df11a7fda540e2 /drivers/net/ethernet/intel/igc/igc.h | |
| parent | c536fc74b4b41ca5cfdebad60943be1ecd092ba1 (diff) | |
| parent | e5264212eb622fbc5704571c8e490c2b5fc718b9 (diff) | |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
1GbE Intel Wired LAN Driver Updates 2020-05-19
This series contains updates to igc only.
Sasha cleans up the igc driver code that is not used or needed.
Vitaly cleans up driver code that was used to support Virtualization on
a device that is not supported by igc, so remove the dead code.
Andre renames a few macros to align with register and field names
described in the data sheet. Also adds the VLAN Priority Queue Fliter
and EType Queue Filter registers to the list of registers dumped by
igc_get_regs(). Added additional debug messages and updated return codes
for unsupported features. Refactored the VLAN priority filtering code to
move the core logic into igc_main.c. Cleaned up duplicate code and
useless code.
====================
Acked-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc.h')
| -rw-r--r-- | drivers/net/ethernet/intel/igc/igc.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h index 661dc8875f3f..812e1cd695cf 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -26,7 +26,7 @@ void igc_set_ethtool_ops(struct net_device *); #define MAX_Q_VECTORS 8 #define MAX_STD_JUMBO_FRAME_SIZE 9216 -#define MAX_ETYPE_FILTER (4 - 1) +#define MAX_ETYPE_FILTER 8 #define IGC_RETA_SIZE 128 struct igc_tx_queue_stats { @@ -189,7 +189,6 @@ struct igc_adapter { /* lock for RX network flow classification filter */ spinlock_t nfc_lock; - bool etype_bitmap[MAX_ETYPE_FILTER]; struct igc_mac_addr *mac_table; @@ -235,6 +234,11 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr, const s8 queue, const u8 flags); int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr, const u8 flags); +int igc_add_vlan_prio_filter(struct igc_adapter *adapter, int prio, + int queue); +void igc_del_vlan_prio_filter(struct igc_adapter *adapter, int prio); +int igc_add_etype_filter(struct igc_adapter *adapter, u16 etype, int queue); +int igc_del_etype_filter(struct igc_adapter *adapter, u16 etype); void igc_update_stats(struct igc_adapter *adapter); /* igc_dump declarations */ @@ -463,7 +467,6 @@ struct igc_nfc_filter { struct hlist_node nfc_node; struct igc_nfc_input filter; unsigned long cookie; - u16 etype_reg_index; u16 sw_idx; u16 action; }; |