diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-12-02 08:47:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-03 12:08:09 -0500 |
commit | cef68bde74f083d83c18ce870ed834e82ee0ae5a (patch) | |
tree | 430ee1d641b6d4f6c54c120fc500de6f9dbee797 /drivers/net/sfc/net_driver.h | |
parent | 40641ed93cd53561f7d53b5fd5ed656b35f3aabd (diff) |
sfc: Move xmac_poll_required into struct falcon_nic_data
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.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index f9d53a01bbc5..b7e8fe967826 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -684,7 +684,6 @@ struct efx_filter_state; | |||
684 | * @mdio: PHY MDIO interface | 684 | * @mdio: PHY MDIO interface |
685 | * @mdio_bus: PHY MDIO bus ID (only used by Siena) | 685 | * @mdio_bus: PHY MDIO bus ID (only used by Siena) |
686 | * @phy_mode: PHY operating mode. Serialised by @mac_lock. | 686 | * @phy_mode: PHY operating mode. Serialised by @mac_lock. |
687 | * @xmac_poll_required: XMAC link state needs polling | ||
688 | * @link_advertising: Autonegotiation advertising flags | 687 | * @link_advertising: Autonegotiation advertising flags |
689 | * @link_state: Current state of the link | 688 | * @link_state: Current state of the link |
690 | * @n_link_state_changes: Number of times the link has changed state | 689 | * @n_link_state_changes: Number of times the link has changed state |
@@ -771,7 +770,6 @@ struct efx_nic { | |||
771 | unsigned int mdio_bus; | 770 | unsigned int mdio_bus; |
772 | enum efx_phy_mode phy_mode; | 771 | enum efx_phy_mode phy_mode; |
773 | 772 | ||
774 | bool xmac_poll_required; | ||
775 | u32 link_advertising; | 773 | u32 link_advertising; |
776 | struct efx_link_state link_state; | 774 | struct efx_link_state link_state; |
777 | unsigned int n_link_state_changes; | 775 | unsigned int n_link_state_changes; |