diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-09 14:54:44 -0500 |
---|---|---|
committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-26 19:10:58 -0500 |
commit | 0fca8c97612f90a68ff6e1873e674b4d69a435db (patch) | |
tree | 124f87f2e6e0b246c9f6447f4c2534b5c7ecb28c | |
parent | 6c8eef4ac8dfd888be5b46e363f8e42b9f0d5b6a (diff) |
sfc: Rename implementation of ndo_set_rx_mode
Rename efx_set_multicast_list() to efx_set_rx_mode(), in line
with the operation name net_device_ops::ndo_set_rx_mode.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
-rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index fce42f428c6c..a352c55cb54a 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c | |||
@@ -852,7 +852,7 @@ int __efx_reconfigure_port(struct efx_nic *efx) | |||
852 | 852 | ||
853 | WARN_ON(!mutex_is_locked(&efx->mac_lock)); | 853 | WARN_ON(!mutex_is_locked(&efx->mac_lock)); |
854 | 854 | ||
855 | /* Serialise the promiscuous flag with efx_set_multicast_list. */ | 855 | /* Serialise the promiscuous flag with efx_set_rx_mode. */ |
856 | netif_addr_lock_bh(efx->net_dev); | 856 | netif_addr_lock_bh(efx->net_dev); |
857 | netif_addr_unlock_bh(efx->net_dev); | 857 | netif_addr_unlock_bh(efx->net_dev); |
858 | 858 | ||
@@ -1844,7 +1844,7 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data) | |||
1844 | } | 1844 | } |
1845 | 1845 | ||
1846 | /* Context: netif_addr_lock held, BHs disabled. */ | 1846 | /* Context: netif_addr_lock held, BHs disabled. */ |
1847 | static void efx_set_multicast_list(struct net_device *net_dev) | 1847 | static void efx_set_rx_mode(struct net_device *net_dev) |
1848 | { | 1848 | { |
1849 | struct efx_nic *efx = netdev_priv(net_dev); | 1849 | struct efx_nic *efx = netdev_priv(net_dev); |
1850 | struct netdev_hw_addr *ha; | 1850 | struct netdev_hw_addr *ha; |
@@ -1898,7 +1898,7 @@ static const struct net_device_ops efx_netdev_ops = { | |||
1898 | .ndo_do_ioctl = efx_ioctl, | 1898 | .ndo_do_ioctl = efx_ioctl, |
1899 | .ndo_change_mtu = efx_change_mtu, | 1899 | .ndo_change_mtu = efx_change_mtu, |
1900 | .ndo_set_mac_address = efx_set_mac_address, | 1900 | .ndo_set_mac_address = efx_set_mac_address, |
1901 | .ndo_set_rx_mode = efx_set_multicast_list, | 1901 | .ndo_set_rx_mode = efx_set_rx_mode, |
1902 | .ndo_set_features = efx_set_features, | 1902 | .ndo_set_features = efx_set_features, |
1903 | #ifdef CONFIG_NET_POLL_CONTROLLER | 1903 | #ifdef CONFIG_NET_POLL_CONTROLLER |
1904 | .ndo_poll_controller = efx_netpoll, | 1904 | .ndo_poll_controller = efx_netpoll, |