diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-03-02 14:55:29 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-03-02 14:55:29 -0500 |
| commit | e69db2c05ad2e83f4bec5d6563b14a774e74ed85 (patch) | |
| tree | 1d6882a74512daf4335a8eb6bff724ea70a5dc5c | |
| parent | 1274fcd685ec15f10261f48dc990367c2180d589 (diff) | |
| parent | 2a0591d988be752aed116f99c0dbe0856d9da3e9 (diff) | |
Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/netdev-2.6/mii
| -rw-r--r-- | drivers/net/b44.h | 14 | ||||
| -rw-r--r-- | drivers/net/tg3.h | 14 | ||||
| -rw-r--r-- | include/linux/mii.h | 4 |
3 files changed, 4 insertions, 28 deletions
diff --git a/drivers/net/b44.h b/drivers/net/b44.h index f886692f20b4..76a3290211e0 100644 --- a/drivers/net/b44.h +++ b/drivers/net/b44.h @@ -302,20 +302,6 @@ #define B44_MII_TLEDCTRL 27 /* Traffic Meter LED */ #define MII_TLEDCTRL_ENABLE 0x0040 -/* XXX Add this to mii.h */ -#ifndef ADVERTISE_PAUSE -#define ADVERTISE_PAUSE_CAP 0x0400 -#endif -#ifndef ADVERTISE_PAUSE_ASYM -#define ADVERTISE_PAUSE_ASYM 0x0800 -#endif -#ifndef LPA_PAUSE -#define LPA_PAUSE_CAP 0x0400 -#endif -#ifndef LPA_PAUSE_ASYM -#define LPA_PAUSE_ASYM 0x0800 -#endif - struct dma_desc { u32 ctrl; u32 addr; diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 629f1897e322..9de18c85abca 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -1548,20 +1548,6 @@ #define MII_TG3_INT_DUPLEXCHG 0x0008 #define MII_TG3_INT_ANEG_PAGE_RX 0x0400 -/* XXX Add this to mii.h */ -#ifndef ADVERTISE_PAUSE -#define ADVERTISE_PAUSE_CAP 0x0400 -#endif -#ifndef ADVERTISE_PAUSE_ASYM -#define ADVERTISE_PAUSE_ASYM 0x0800 -#endif -#ifndef LPA_PAUSE -#define LPA_PAUSE_CAP 0x0400 -#endif -#ifndef LPA_PAUSE_ASYM -#define LPA_PAUSE_ASYM 0x0800 -#endif - /* There are two ways to manage the TX descriptors on the tigon3. * Either the descriptors are in host DMA'able memory, or they * exist only in the cards on-chip SRAM. All 16 send bds are under diff --git a/include/linux/mii.h b/include/linux/mii.h index c674b2ec6003..3228ec1cb2d4 100644 --- a/include/linux/mii.h +++ b/include/linux/mii.h @@ -67,6 +67,8 @@ #define ADVERTISE_100HALF 0x0080 /* Try for 100mbps half-duplex */ #define ADVERTISE_100FULL 0x0100 /* Try for 100mbps full-duplex */ #define ADVERTISE_100BASE4 0x0200 /* Try for 100mbps 4k packets */ +#define ADVERTISE_PAUSE_CAP 0x0400 /* Try for pause */ +#define ADVERTISE_PAUSE_ASYM 0x0800 /* Try for asymetric pause */ #define ADVERTISE_RESV 0x1c00 /* Unused... */ #define ADVERTISE_RFAULT 0x2000 /* Say we can detect faults */ #define ADVERTISE_LPACK 0x4000 /* Ack link partners response */ @@ -84,6 +86,8 @@ #define LPA_100HALF 0x0080 /* Can do 100mbps half-duplex */ #define LPA_100FULL 0x0100 /* Can do 100mbps full-duplex */ #define LPA_100BASE4 0x0200 /* Can do 100mbps 4k packets */ +#define LPA_PAUSE_CAP 0x0400 /* Can pause */ +#define LPA_PAUSE_ASYM 0x0800 /* Can pause asymetrically */ #define LPA_RESV 0x1c00 /* Unused... */ #define LPA_RFAULT 0x2000 /* Link partner faulted */ #define LPA_LPACK 0x4000 /* Link partner acked us */ |