sfc: Change MAC promiscuity and multicast hash at the same time

From: Steve Hodgson <shodgson@solarflare.com>

Currently we can set multicast hash immediately (in atomic context)
but must delay setting MAC promiscuity.  There is not that much
point in deferring one but not the other, and setting the multicast
hash on Siena will involve a firmware request.  So process them
both in efx_mac_work().

Also, set the broadcast bit in the multicast hash in
efx_set_multicast_list(), since this is required for both Falcon and
Siena.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index fac534a274c8..e26043eb01b5 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -1993,7 +1993,7 @@ void falcon_reconfigure_mac_wrapper(struct efx_nic *efx)
         efx_writeo(efx, &reg, FR_AB_MAC_CTRL);
 
         /* Restore the multicast hash registers. */
-        falcon_set_multicast_hash(efx);
+        falcon_push_multicast_hash(efx);
 
         /* Transmission of pause frames when RX crosses the threshold is
          * covered by RX_XOFF_MAC_EN and XM_TX_CFG_REG:XM_FCNTL.
@@ -2327,15 +2327,11 @@ void falcon_remove_port(struct efx_nic *efx)
  **************************************************************************
  */
 
-void falcon_set_multicast_hash(struct efx_nic *efx)
+void falcon_push_multicast_hash(struct efx_nic *efx)
 {
         union efx_multicast_hash *mc_hash = &efx->multicast_hash;
 
-        /* Broadcast packets go through the multicast hash filter.
-         * ether_crc_le() of the broadcast address is 0xbe2612ff
-         * so we always add bit 0xff to the mask.
-         */
-        set_bit_le(0xff, mc_hash->byte);
+        WARN_ON(!mutex_is_locked(&efx->mac_lock));
 
         efx_writeo(efx, &mc_hash->oword[0], FR_AB_MAC_MC_HASH_REG0);
         efx_writeo(efx, &mc_hash->oword[1], FR_AB_MAC_MC_HASH_REG1);