diff options
| author |   Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 12:55:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 12:55:26 -0800 |
| commit | 8be7ed14f4f45e0cd19a70120a1526e1121af4b0 (patch) | |
| tree | 6529bad824cecc06639c09b0f33ff5b377bb0c75 /drivers/net/sungem_phy.h | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (diff) | |
| parent | [IPV4/IPV6]: Fix inet{,6} device initialization order. (diff) | |
| download | linux-dev-8be7ed14f4f45e0cd19a70120a1526e1121af4b0.tar.xz linux-dev-8be7ed14f4f45e0cd19a70120a1526e1121af4b0.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4/IPV6]: Fix inet{,6} device initialization order.
[TCP]: Use old definition of before
[NETFILTER]: ebtables: don't compute gap before checking struct type
[NETFILTER]: nf_nat: fix MASQUERADE crash on device down
[NETFILTER]: New connection tracking is not EXPERIMENTAL anymore
[NETFILTER]: Fix routing of REJECT target generated packets in output chain
[NETFILTER]: compat offsets size change
[SUNGEM]: PHY updates & pause fixes (#2)
[X25]: proper prototype for x25_init_timers()
[AF_NETLINK]: module_put cleanup
[XFRM_USER]: avoid pointless void ** casts
[NETFILTER] xt_hashlimit.c: fix typo
[NET] drivers/net/loopback.c: convert to module_init()
[PKTGEN]: Convert to kthread API.
[NET]: ifb double-counts packets
Diffstat (limited to 'drivers/net/sungem_phy.h')
| -rw-r--r-- | drivers/net/sungem_phy.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/sungem_phy.h b/drivers/net/sungem_phy.h index 8ee1ca0471cf..1d70ba6f9f10 100644 --- a/drivers/net/sungem_phy.h +++ b/drivers/net/sungem_phy.h @@ -30,7 +30,7 @@ struct mii_phy_def struct mii_phy { struct mii_phy_def* def; - int advertising; + u32 advertising; int mii_id; /* 1: autoneg enabled, 0: disabled */ @@ -85,6 +85,9 @@ extern int mii_phy_probe(struct mii_phy *phy, int mii_id); #define MII_BCM5221_SHDOW_AUX_MODE4_IDDQMODE 0x0001 #define MII_BCM5221_SHDOW_AUX_MODE4_CLKLOPWR 0x0004 +/* MII BCM5241 Additional registers */ +#define MII_BCM5241_SHDOW_AUX_MODE4_STANDBYPWR 0x0008 + /* MII BCM5400 1000-BASET Control register */ #define MII_BCM5400_GB_CONTROL 0x09 #define MII_BCM5400_GB_CONTROL_FULLDUPLEXCAP 0x0200 @@ -115,5 +118,7 @@ extern int mii_phy_probe(struct mii_phy *phy, int mii_id); #define MII_M1011_PHY_SPEC_STATUS_SPD_MASK 0xc000 #define MII_M1011_PHY_SPEC_STATUS_FULLDUPLEX 0x2000 #define MII_M1011_PHY_SPEC_STATUS_RESOLVED 0x0800 +#define MII_M1011_PHY_SPEC_STATUS_TX_PAUSE 0x0008 +#define MII_M1011_PHY_SPEC_STATUS_RX_PAUSE 0x0004 #endif /* __SUNGEM_PHY_H__ */ |