From 9915f7ca3dab67ccd5b83c5a897f3e0562fc8c1f Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Wed, 19 Dec 2012 19:07:11 -0800 Subject: [PATCH] compat-drivers: update 0001-backport-alx.patch context Signed-off-by: Luis R. Rodriguez --- patches/unified-drivers/network/0001-backport-alx.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/unified-drivers/network/0001-backport-alx.patch b/patches/unified-drivers/network/0001-backport-alx.patch index 0638f394eb91..7a476d8f81d1 100644 --- a/patches/unified-drivers/network/0001-backport-alx.patch +++ b/patches/unified-drivers/network/0001-backport-alx.patch @@ -12,8 +12,8 @@ This should go into patches/01-netdev.patch + alx_add_mc_addr(hw, ha->dmi_addr); +#endif - ALX_MEM_W32(hw, ALX_HASH_TBL0, adpt->mc_hash[0]); - ALX_MEM_W32(hw, ALX_HASH_TBL1, adpt->mc_hash[1]); + ALX_MEM_W32(hw, ALX_HASH_TBL0, hw->mc_hash[0]); + ALX_MEM_W32(hw, ALX_HASH_TBL1, hw->mc_hash[1]); @@ -133,8 +137,10 @@ static int alx_set_mac_address(struct ne if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; @@ -24,7 +24,7 @@ This should go into patches/01-netdev.patch +#endif memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); - memcpy(adpt->mac_addr, addr->sa_data, netdev->addr_len); + memcpy(hw->mac_addr, addr->sa_data, netdev->addr_len); @@ -1130,6 +1136,7 @@ static int __devinit alx_init_sw(struct return err; } -- 2.30.2