summaryrefslogtreecommitdiffstats
path: root/drivers/net/niu.h
diff options
context:
space:
mode:
authorConstantin Baranov <baranov@mercdev.com>2009-02-18 17:53:20 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-18 17:53:20 -0800
commit38bb045d493cc166920834087acd934dedc1b5d5 (patch)
tree361c59343742e3743d40a09129a90d73581bdcb4 /drivers/net/niu.h
parente0d8496a66de9eca13a88d93a5642db47e5a2b60 (diff)
downloadlinux-stable-38bb045d493cc166920834087acd934dedc1b5d5.tar.gz
linux-stable-38bb045d493cc166920834087acd934dedc1b5d5.tar.bz2
linux-stable-38bb045d493cc166920834087acd934dedc1b5d5.zip
niu: improve ethtool support for gigabit copper cards
Introduced support for link speed and duplex setting (ethtool -s), link advertising parameters and autonegotiation (ethtool -r): - struct niu_link_config: split advertising and autoneg fields into active and target values (similar to speed and duplex fields) - mii_init_common(): rewrite function to actually apply requested niu_link_config parameters instead of providing default initialization - link_status_1g(): move parsing of MII registers into new link_status_mii() function (link_status_1g_rgmii() could possibly use this new implementation too) - introduce simple nway_reset method - fix incorrect XMAC_CONFIG_MODE selection for 10Mbps case Signed-off-by: Constantin Baranov <baranov@mercdev.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/niu.h')
-rw-r--r--drivers/net/niu.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/niu.h b/drivers/net/niu.h
index e1a7392e8d70..5a002375b35b 100644
--- a/drivers/net/niu.h
+++ b/drivers/net/niu.h
@@ -3131,16 +3131,19 @@ struct niu_ops {
};
struct niu_link_config {
+ u32 supported;
+
/* Describes what we're trying to get. */
u32 advertising;
- u32 supported;
u16 speed;
u8 duplex;
u8 autoneg;
/* Describes what we actually have. */
+ u32 active_advertising;
u16 active_speed;
u8 active_duplex;
+ u8 active_autoneg;
#define SPEED_INVALID 0xffff
#define DUPLEX_INVALID 0xff
#define AUTONEG_INVALID 0xff