diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-02-06 23:16:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-07 02:43:04 -0800 |
| commit | c1889bfe687c22f74d1333913ffe8f8da173d601 (patch) | |
| tree | dff3d16c38181e79437c6d6c82817a127b4de686 /drivers/net/igb/e1000_hw.h | |
| parent | 4d6b725e4d8e499fad012a25381c8d9bf53fbf4b (diff) | |
igb: make dev_spec a union and remove dynamic allocation
This patch makes dev_spec a union and simplifies it so that it does not
require dynamic allocation and freeing in the driver.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/e1000_hw.h')
| -rw-r--r-- | drivers/net/igb/e1000_hw.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index 99504a600a8..06f72ae6a2c 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h @@ -565,9 +565,12 @@ struct e1000_fc_info { enum e1000_fc_type original_type; }; +struct e1000_dev_spec_82575 { + bool sgmii_active; +}; + struct e1000_hw { void *back; - void *dev_spec; u8 __iomem *hw_addr; u8 __iomem *flash_address; @@ -580,7 +583,9 @@ struct e1000_hw { struct e1000_bus_info bus; struct e1000_host_mng_dhcp_cookie mng_cookie; - u32 dev_spec_size; + union { + struct e1000_dev_spec_82575 _82575; + } dev_spec; u16 device_id; u16 subsystem_vendor_id; |