From patchwork Wed Aug 20 22:17:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Einon X-Patchwork-Id: 381834 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 24FA9140096 for ; Thu, 21 Aug 2014 08:21:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753583AbaHTWUu (ORCPT ); Wed, 20 Aug 2014 18:20:50 -0400 Received: from mail-we0-f179.google.com ([74.125.82.179]:54524 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752824AbaHTWSL (ORCPT ); Wed, 20 Aug 2014 18:18:11 -0400 Received: by mail-we0-f179.google.com with SMTP id u57so8614963wes.10 for ; Wed, 20 Aug 2014 15:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Or8fMBLzImTVytGqcCw/xHR3AGe7gfY7lvtb/+dUyew=; b=ldYCq/FliiERbxwPjenXcB+rtuhYoZd1oXru0Q1vRE4JyWzMEi2zMaE0CT0I9o3D4i szbXjDuvZZzXrOsyFmjHNzmlLBGhfA2zCcxHTktk3a+HHTD3C85MnQpNVPkb4F8Ql6Hn raFThgCufEUlXu9gZCM1q/G08V6OugLWgz0ad+c8og7qwzp4Db3xNEvtDWHu7YN0WL9O x7Y9cRfLev0vGtQo+C/mU9FNrO4ymq2kp+xG8Va9xzAL4r0g/k+9LlpB+D5wMM0gCxwh PYKJHI9lhAW8oz8iKtvTIH4L60RK7ukniyLgCdnBlpn24pOK74h3E2iwgqfgKBupsxjm QElQ== X-Received: by 10.180.108.1 with SMTP id hg1mr18974028wib.25.1408573090009; Wed, 20 Aug 2014 15:18:10 -0700 (PDT) Received: from msilap.einon.net ([80.229.23.162]) by mx.google.com with ESMTPSA id f3sm13378073wiz.0.2014.08.20.15.18.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Aug 2014 15:18:09 -0700 (PDT) From: Mark Einon To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Mark Einon Subject: [PATCH 1/8] staging: et131x: Use eth_mac_addr() instead of duplicating the functionality Date: Wed, 20 Aug 2014 23:17:51 +0100 Message-Id: <1408573078-9320-2-git-send-email-mark.einon@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com> References: <1408573078-9320-1-git-send-email-mark.einon@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There's already working code to set the mac address, so let's use it. Signed-off-by: Mark Einon --- drivers/staging/et131x/et131x.c | 53 +---------------------------------------- 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 831b7c6..ac6700b 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -4468,57 +4468,6 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu) return result; } -/* et131x_set_mac_addr - handler to change the MAC address for the device */ -static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac) -{ - int result = 0; - struct et131x_adapter *adapter = netdev_priv(netdev); - struct sockaddr *address = new_mac; - - if (adapter == NULL) - return -ENODEV; - - /* Make sure the requested MAC is valid */ - if (!is_valid_ether_addr(address->sa_data)) - return -EADDRNOTAVAIL; - - et131x_disable_txrx(netdev); - et131x_handle_send_interrupt(adapter); - et131x_handle_recv_interrupt(adapter); - - /* Set the new MAC */ - /* netdev->set_mac_address = &new_mac; */ - - memcpy(netdev->dev_addr, address->sa_data, netdev->addr_len); - - netdev_info(netdev, "Setting MAC address to %pM\n", - netdev->dev_addr); - - /* Free Rx DMA memory */ - et131x_adapter_memory_free(adapter); - - et131x_soft_reset(adapter); - - /* Alloc and init Rx DMA memory */ - result = et131x_adapter_memory_alloc(adapter); - if (result != 0) { - dev_err(&adapter->pdev->dev, - "Change MAC failed; couldn't re-alloc DMA memory\n"); - return result; - } - - et131x_init_send(adapter); - - et131x_hwaddr_init(adapter); - - /* Init the device with the new settings */ - et131x_adapter_setup(adapter); - - et131x_enable_txrx(netdev); - - return result; -} - static const struct net_device_ops et131x_netdev_ops = { .ndo_open = et131x_open, .ndo_stop = et131x_close, @@ -4526,7 +4475,7 @@ static const struct net_device_ops et131x_netdev_ops = { .ndo_set_rx_mode = et131x_multicast, .ndo_tx_timeout = et131x_tx_timeout, .ndo_change_mtu = et131x_change_mtu, - .ndo_set_mac_address = et131x_set_mac_addr, + .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, .ndo_get_stats = et131x_stats, .ndo_do_ioctl = et131x_ioctl,