From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758746Ab2CAQyB (ORCPT ); Thu, 1 Mar 2012 11:54:01 -0500 Received: from wp188.webpack.hosteurope.de ([80.237.132.195]:51662 "EHLO wp188.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757092Ab2CAQxP (ORCPT ); Thu, 1 Mar 2012 11:53:15 -0500 From: Danny Kukawka To: "David S. Miller" Cc: Danny Kukawka , Paul Gortmaker , Alexey Dobriyan , Joe Perches , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] ethoc: add .ndo_validate_addr to net_device_ops Date: Thu, 1 Mar 2012 17:52:24 +0100 Message-Id: <1330620747-4047-5-git-send-email-danny.kukawka@bisect.de> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1330620747-4047-1-git-send-email-danny.kukawka@bisect.de> References: <1330620747-4047-1-git-send-email-danny.kukawka@bisect.de> X-bounce-key: webpack.hosteurope.de;danny.kukawka@bisect.de;1330620795;3125ba4e; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add eth_validate_addr() to .ndo_validate_addr to get validation checks in dev_set_mac_address() working. Remove is_valid_ether_addr() from ethoc_set_mac_address() to prevent double check. Signed-off-by: Danny Kukawka --- drivers/net/ethernet/ethoc.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c index a381678..ca80f19 100644 --- a/drivers/net/ethernet/ethoc.c +++ b/drivers/net/ethernet/ethoc.c @@ -776,9 +776,6 @@ static int ethoc_set_mac_address(struct net_device *dev, void *addr) struct ethoc *priv = netdev_priv(dev); u8 *mac = (u8 *)addr; - if (!is_valid_ether_addr(mac)) - return -EADDRNOTAVAIL; - ethoc_write(priv, MAC_ADDR0, (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | (mac[5] << 0)); ethoc_write(priv, MAC_ADDR1, (mac[0] << 8) | (mac[1] << 0)); @@ -899,6 +896,7 @@ static const struct net_device_ops ethoc_netdev_ops = { .ndo_change_mtu = ethoc_change_mtu, .ndo_tx_timeout = ethoc_tx_timeout, .ndo_start_xmit = ethoc_start_xmit, + .ndo_validate_addr = eth_validate_addr, }; /** -- 1.7.8.3