From 43b2f5c33682a66ee4cb3d6a6c30aca583862cec Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 20 Feb 2012 00:46:06 -0500 Subject: [PATCH] --- yaml --- r: 290214 b: refs/heads/master c: 5277f7a6c2f322f11e8deed48530296d70bc5d5f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 96a664cce85c..b20457bc3402 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5055d2f236e1495d68c468eeb684fd5789673f1d +refs/heads/master: 5277f7a6c2f322f11e8deed48530296d70bc5d5f diff --git a/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c b/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c index eb285418924e..d21591a2c593 100644 --- a/trunk/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/trunk/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);