diff options
| author | Jakub Kicinski <[email protected]> | 2024-02-09 12:58:39 -0800 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-02-09 12:58:40 -0800 |
| commit | d0466c7f55a0cd42089b6d31df46c19e86e1a60f (patch) | |
| tree | b6f8fd1043de8b36b506bb47239782870d157b9c /drivers/net/ethernet/intel/igc/igc.h | |
| parent | d45f5fa8b4aeaf24d2d5911cb459aeb74bada52c (diff) | |
| parent | b7471025942d786ab5f3f84932d6d1015511d197 (diff) | |
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
Tony Nguyen says:
====================
igc: ethtool: Flex filter cleanup
Kurt Kanzenbach says:
This series contains some cosmetics for the flex filter code. The fixes have
been merged separately via -net already.
* '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
igc: Unify filtering rule fields
igc: Use netdev printing functions for flex filters
igc: Use reverse xmas tree
====================
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc.h')
| -rw-r--r-- | drivers/net/ethernet/intel/igc/igc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h index 75f7c5ba65e0..d5833c057de4 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -585,7 +585,7 @@ enum igc_filter_match_flags { struct igc_nfc_filter { u8 match_flags; u16 etype; - __be16 vlan_etype; + u16 vlan_etype; u16 vlan_tci; u16 vlan_tci_mask; u8 src_addr[ETH_ALEN]; |