From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751321AbVILPEd (ORCPT ); Mon, 12 Sep 2005 11:04:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751363AbVILPEH (ORCPT ); Mon, 12 Sep 2005 11:04:07 -0400 Received: from ra.tuxdriver.com ([24.172.12.4]:21767 "EHLO ra.tuxdriver.com") by vger.kernel.org with ESMTP id S1751347AbVILO6c (ORCPT ); Mon, 12 Sep 2005 10:58:32 -0400 Date: Mon, 12 Sep 2005 10:48:58 -0400 From: "John W. Linville" To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: rl@hellgate.ch, jgarzik@pobox.com, Jon_Wetzel@Dell.com Subject: [patch 2.6.13 16/16] via-rhine: support ETHTOOL_GPERMADDR Message-ID: <09122005104858.32735@bilbo.tuxdriver.com> In-Reply-To: <09122005104858.32669@bilbo.tuxdriver.com> User-Agent: PatchPost/0.1 Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Add support for ETHTOOL_GPERMADDR to via-rhine. Signed-off-by: John W. Linville --- drivers/net/via-rhine.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -814,8 +814,9 @@ static int __devinit rhine_init_one(stru for (i = 0; i < 6; i++) dev->dev_addr[i] = ioread8(ioaddr + StationAddr + i); + memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len); - if (!is_valid_ether_addr(dev->dev_addr)) { + if (!is_valid_ether_addr(dev->perm_addr)) { rc = -EIO; printk(KERN_ERR "Invalid MAC address\n"); goto err_out_unmap; @@ -1829,6 +1830,7 @@ static struct ethtool_ops netdev_ethtool .set_wol = rhine_set_wol, .get_sg = ethtool_op_get_sg, .get_tx_csum = ethtool_op_get_tx_csum, + .get_perm_addr = ethtool_op_get_perm_addr, }; static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)