aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/net_driver.h
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-12-02 08:48:28 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-03 12:08:11 -0500
commit7e300bc8e6736d41e7b92978f415572ac60fd59b (patch)
treeb48dc8243946bd08e3c7eef5171d910218a43987 /drivers/net/sfc/net_driver.h
parent02ebc26865c2755720d2ede90a5ab27c45741823 (diff)
sfc: Store MAC address from NVRAM in net_device::perm_addr
For some reason we failed to make this change when perm_addr was introduced. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
-rw-r--r--drivers/net/sfc/net_driver.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 6dd5e6d65dfe..0d19fbfc5c2c 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -678,7 +678,6 @@ struct efx_filter_state;
678 * @stats_buffer: DMA buffer for statistics 678 * @stats_buffer: DMA buffer for statistics
679 * @stats_lock: Statistics update lock. Serialises statistics fetches 679 * @stats_lock: Statistics update lock. Serialises statistics fetches
680 * @mac_op: MAC interface 680 * @mac_op: MAC interface
681 * @mac_address: Permanent MAC address
682 * @phy_type: PHY type 681 * @phy_type: PHY type
683 * @phy_op: PHY interface 682 * @phy_op: PHY interface
684 * @phy_data: PHY private data (including PHY-specific stats) 683 * @phy_data: PHY private data (including PHY-specific stats)
@@ -762,7 +761,6 @@ struct efx_nic {
762 spinlock_t stats_lock; 761 spinlock_t stats_lock;
763 762
764 struct efx_mac_operations *mac_op; 763 struct efx_mac_operations *mac_op;
765 unsigned char mac_address[ETH_ALEN];
766 764
767 unsigned int phy_type; 765 unsigned int phy_type;
768 struct efx_phy_operations *phy_op; 766 struct efx_phy_operations *phy_op;