summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sfc/farch.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-11 20:41:19 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-10-11 20:41:19 +0200
commit4af6600fd793023c01634cca5abfe4a2b707788f (patch)
tree9e3a830d7782512b492011932ddd789d13a900c4 /drivers/net/ethernet/sfc/farch.c
parentMerge branch 'next' into for-linus (diff)
parentInput: i8042 - disable active multiplexing by default (diff)
downloadlinux-4af6600fd793023c01634cca5abfe4a2b707788f.tar.xz
linux-4af6600fd793023c01634cca5abfe4a2b707788f.zip
Merge branch 'next' into for-linus
Prepare second round of input updates for 3.18.
Diffstat (limited to 'drivers/net/ethernet/sfc/farch.c')
-rw-r--r--drivers/net/ethernet/sfc/farch.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/farch.c b/drivers/net/ethernet/sfc/farch.c
index 0537381cd2f6..6859437b59fb 100644
--- a/drivers/net/ethernet/sfc/farch.c
+++ b/drivers/net/ethernet/sfc/farch.c
@@ -2933,6 +2933,9 @@ void efx_farch_filter_sync_rx_mode(struct efx_nic *efx)
u32 crc;
int bit;
+ if (!efx_dev_registered(efx))
+ return;
+
netif_addr_lock_bh(net_dev);
efx->unicast_filter = !(net_dev->flags & IFF_PROMISC);