Commit a847431c authored by Martin Habets's avatar Martin Habets Committed by David S. Miller
Browse files

sfc: Filter cleanups for Falcon and Siena 



unicast_filter and multicast_hash are no longer needed.

Signed-off-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Acked-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a623b3a5

drivers/net/ethernet/sfc/mcdi_port_common.c

+0 −5
Original line number Diff line number Diff line
@@ -1106,11 +1106,6 @@ int efx_mcdi_set_mac(struct efx_nic *efx) 


	MCDI_SET_DWORD(cmdbytes, SET_MAC_IN_MTU, efx_calc_mac_mtu(efx));

	MCDI_SET_DWORD(cmdbytes, SET_MAC_IN_DRAIN, 0);



	/* Set simple MAC filter for Siena */

	MCDI_POPULATE_DWORD_1(cmdbytes, SET_MAC_IN_REJECT,

			      SET_MAC_IN_REJECT_UNCST, efx->unicast_filter);



	MCDI_POPULATE_DWORD_1(cmdbytes, SET_MAC_IN_FLAGS,

			      SET_MAC_IN_FLAG_INCLUDE_FCS,

			      !!(efx->net_dev->features & NETIF_F_RXFCS));

drivers/net/ethernet/sfc/net_driver.h

+0 −18
Original line number Diff line number Diff line
@@ -752,18 +752,6 @@ struct efx_hw_stat_desc { 
	u16 offset;

};



/* Number of bits used in a multicast filter hash address */

#define EFX_MCAST_HASH_BITS 8



/* Number of (single-bit) entries in a multicast filter hash */

#define EFX_MCAST_HASH_ENTRIES (1 << EFX_MCAST_HASH_BITS)



/* An Efx multicast filter hash */

union efx_multicast_hash {

	u8 byte[EFX_MCAST_HASH_ENTRIES / 8];

	efx_oword_t oword[EFX_MCAST_HASH_ENTRIES / sizeof(efx_oword_t) / 8];

};



struct vfdi_status;



/* The reserved RSS context value */
@@ -955,10 +943,6 @@ struct efx_mae; 
 *	see &enum ethtool_fec_config_bits.

 * @link_state: Current state of the link

 * @n_link_state_changes: Number of times the link has changed state

 * @unicast_filter: Flag for Falcon-arch simple unicast filter.

 *	Protected by @mac_lock.

 * @multicast_hash: Multicast hash table for Falcon-arch.

 *	Protected by @mac_lock.

 * @wanted_fc: Wanted flow control flags

 * @fc_disable: When non-zero flow control is disabled. Typically used to

 *	ensure that network back pressure doesn't delay dma queue flushes.
@@ -1137,8 +1121,6 @@ struct efx_nic { 
	struct efx_link_state link_state;

	unsigned int n_link_state_changes;



	bool unicast_filter;

	union efx_multicast_hash multicast_hash;

	u8 wanted_fc;

	unsigned fc_disable;