[PATCH 8/8] octeon: use dev_set_mac_address() instead of octeon_mgmt_set_mac_address()
From: Danny Kukawka <hidden>
Date: 2012-02-29 15:43:47
Also in:
lkml
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Use dev_set_mac_address() instead of octeon_mgmt_set_mac_address() directly to get validation checks for free. Add .ndo_validate_addr = eth_validate_addr to enable validation. Signed-off-by: Danny Kukawka <redacted> --- drivers/net/ethernet/octeon/octeon_mgmt.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
index cd827ff..fb6553d 100644
--- a/drivers/net/ethernet/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/octeon/octeon_mgmt.c@@ -551,9 +551,6 @@ static int octeon_mgmt_set_mac_address(struct net_device *netdev, void *addr) { struct sockaddr *sa = addr; - if (!is_valid_ether_addr(sa->sa_data)) - return -EADDRNOTAVAIL; - memcpy(netdev->dev_addr, sa->sa_data, ETH_ALEN); octeon_mgmt_set_rx_filtering(netdev);
@@ -768,7 +765,7 @@ static int octeon_mgmt_open(struct net_device *netdev) cvmx_write_csr(CVMX_AGL_GMX_PRTX_CFG(port), prtx_cfg.u64); memcpy(sa.sa_data, netdev->dev_addr, ETH_ALEN); - octeon_mgmt_set_mac_address(netdev, &sa); + dev_set_mac_address(netdev, &sa); octeon_mgmt_change_mtu(netdev, netdev->mtu);
@@ -1064,6 +1061,7 @@ static const struct net_device_ops octeon_mgmt_ops = { .ndo_set_mac_address = octeon_mgmt_set_mac_address, .ndo_do_ioctl = octeon_mgmt_ioctl, .ndo_change_mtu = octeon_mgmt_change_mtu, + .ndo_validate_addr = eth_validate_addr, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = octeon_mgmt_poll_controller, #endif
--
1.7.8.3