[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20120220.004631.1816710786293972830.davem@davemloft.net>
Date: Mon, 20 Feb 2012 00:46:31 -0500 (EST)
From: David Miller <davem@...emloft.net>
To: sfr@...b.auug.org.au
Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, danny.kukawka@...ect.de
Subject: Re: linux-next: build failure after merge of the final tree
(net-next tree related)
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 20 Feb 2012 16:15:45 +1100
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_set_mac_address':
> drivers/net/ethernet/xilinx/ll_temac_main.c:332:3: error: 'dev' undeclared (first use in this function)
>
> Caused by commit 5a5e7c364486 ("xilinx ll_temac: use eth_hw_addr_random()
> instead of random_ether_addr()").
>
> I have reverted that commit for today.
I've fixed it as follows:
--------------------
ll_temac: Fix build.
Reported-by: Stephen Rothwell <sfr@...b.auug.org.au>
Signed-off-by: David S. Miller <davem@...emloft.net>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index eb28541..d21591a 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -329,7 +329,7 @@ static int temac_set_mac_address(struct net_device *ndev, void *address)
if (!is_valid_ether_addr(ndev->dev_addr))
eth_hw_addr_random(ndev);
else
- dev->addr_assign_type &= ~NET_ADDR_RANDOM;
+ ndev->addr_assign_type &= ~NET_ADDR_RANDOM;
/* set up unicast MAC address filter set its mac address */
mutex_lock(&lp->indirect_mutex);
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists