* [PATCH] tg3.h & b44.h ifndef ADVERTISE_PAUSE typo
@ 2005-01-11 14:42 David Hollis
2005-01-11 18:57 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: David Hollis @ 2005-01-11 14:42 UTC (permalink / raw)
To: Netdev
[-- Attachment #1.1: Type: text/plain, Size: 344 bytes --]
tg3.h and b44.h define ADVERTISE_PAUSE_CAP if ADVERTISE_PAUSE
is not defined. Both include a notation that these values should
be added to mii.h. If ADVERTISE_PAUSE_CAP was added to mii.h,
these defines would break since they are checking for ADVERTISE_PAUSE
instead of ADVERTISE_PAUSE_CAP.
--
David Hollis <dhollis@davehollis.com>
[-- Attachment #1.2: b44_tg3_advertise_define.patch --]
[-- Type: text/x-patch, Size: 1171 bytes --]
tg3.h and b44.h define ADVERTISE_PAUSE_CAP if ADVERTISE_PAUSE
is not defined. Both include a notation that these values should
be added to mii.h. If ADVERTISE_PAUSE_CAP was added to mii.h,
these defines would break since they are checking for ADVERTISE_PAUSE
instead of ADVERTISE_PAUSE_CAP.
Signed-off-by: David Hollis <dhollis@davehollis.com>
drivers/net/b44.h | 2 +-
drivers/net/tg3.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/net/b44.h 2005-01-11 09:34:39.178739728 -0500
+++ b/drivers/net/b44.h 2005-01-11 09:34:54.215453800 -0500
@@ -303,7 +303,7 @@
#define MII_TLEDCTRL_ENABLE 0x0040
/* XXX Add this to mii.h */
-#ifndef ADVERTISE_PAUSE
+#ifndef ADVERTISE_PAUSE_CAP
#define ADVERTISE_PAUSE_CAP 0x0400
#endif
#ifndef ADVERTISE_PAUSE_ASYM
--- a/drivers/net/tg3.h 2005-01-11 09:34:43.562073360 -0500
+++ b/drivers/net/tg3.h 2005-01-11 09:35:00.786454856 -0500
@@ -1532,7 +1532,7 @@
#define MII_TG3_INT_ANEG_PAGE_RX 0x0400
/* XXX Add this to mii.h */
-#ifndef ADVERTISE_PAUSE
+#ifndef ADVERTISE_PAUSE_CAP
#define ADVERTISE_PAUSE_CAP 0x0400
#endif
#ifndef ADVERTISE_PAUSE_ASYM
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tg3.h & b44.h ifndef ADVERTISE_PAUSE typo
2005-01-11 14:42 [PATCH] tg3.h & b44.h ifndef ADVERTISE_PAUSE typo David Hollis
@ 2005-01-11 18:57 ` Jeff Garzik
2005-01-11 19:48 ` David Hollis
0 siblings, 1 reply; 5+ messages in thread
From: Jeff Garzik @ 2005-01-11 18:57 UTC (permalink / raw)
To: David Hollis; +Cc: Netdev
David Hollis wrote:
> tg3.h and b44.h define ADVERTISE_PAUSE_CAP if ADVERTISE_PAUSE
> is not defined. Both include a notation that these values should
> be added to mii.h. If ADVERTISE_PAUSE_CAP was added to mii.h,
> these defines would break since they are checking for ADVERTISE_PAUSE
> instead of ADVERTISE_PAUSE_CAP.
>
> Signed-off-by: David Hollis <dhollis@davehollis.com>
>
> drivers/net/b44.h | 2 +-
> drivers/net/tg3.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> --- a/drivers/net/b44.h 2005-01-11 09:34:39.178739728 -0500
> +++ b/drivers/net/b44.h 2005-01-11 09:34:54.215453800 -0500
> @@ -303,7 +303,7 @@
> #define MII_TLEDCTRL_ENABLE 0x0040
>
> /* XXX Add this to mii.h */
> -#ifndef ADVERTISE_PAUSE
> +#ifndef ADVERTISE_PAUSE_CAP
> #define ADVERTISE_PAUSE_CAP 0x0400
> #endif
> #ifndef ADVERTISE_PAUSE_ASYM
> --- a/drivers/net/tg3.h 2005-01-11 09:34:43.562073360 -0500
> +++ b/drivers/net/tg3.h 2005-01-11 09:35:00.786454856 -0500
> @@ -1532,7 +1532,7 @@
> #define MII_TG3_INT_ANEG_PAGE_RX 0x0400
>
> /* XXX Add this to mii.h */
> -#ifndef ADVERTISE_PAUSE
> +#ifndef ADVERTISE_PAUSE_CAP
> #define ADVERTISE_PAUSE_CAP 0x0400
> #endif
> #ifndef ADVERTISE_PAUSE_ASYM
Just kill the ifdef and add it to mii.h.
Jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tg3.h & b44.h ifndef ADVERTISE_PAUSE typo
2005-01-11 18:57 ` Jeff Garzik
@ 2005-01-11 19:48 ` David Hollis
2005-01-11 20:07 ` Jeff Garzik
2005-01-27 22:17 ` Jeff Garzik
0 siblings, 2 replies; 5+ messages in thread
From: David Hollis @ 2005-01-11 19:48 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Netdev
[-- Attachment #1.1: Type: text/plain, Size: 249 bytes --]
On Tue, 2005-01-11 at 13:57 -0500, Jeff Garzik wrote:
> Just kill the ifdef and add it to mii.h.
>
> Jeff
>
Attached patch moves those defines to mii.h and removes them from tg3.h
& b44.h.
--
David Hollis <dhollis@davehollis.com>
[-- Attachment #1.2: mii-advert-pause.patch --]
[-- Type: text/x-patch, Size: 3066 bytes --]
Add defines for full-duplex pause advertisements and capability to mii.h
and remove individual defines in network drivers.
Signed-off-by: David Hollis <dhollis@davehollis.com>
drivers/net/b44.h | 14 --------------
drivers/net/tg3.h | 14 --------------
include/linux/mii.h | 4 ++++
3 files changed, 4 insertions(+), 28 deletions(-)
--- include/linux/mii.h.orig 2005-01-11 14:42:24.992330304 -0500
+++ include/linux/mii.h 2005-01-11 14:41:49.499726000 -0500
@@ -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 */
--- drivers/net/b44.h.orig 2005-01-11 09:34:39.000000000 -0500
+++ drivers/net/b44.h 2005-01-11 14:36:43.372264448 -0500
@@ -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;
--- drivers/net/tg3.h.orig 2005-01-11 09:34:43.000000000 -0500
+++ drivers/net/tg3.h 2005-01-11 14:36:54.169623000 -0500
@@ -1531,20 +1531,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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2005-01-27 22:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-01-11 14:42 [PATCH] tg3.h & b44.h ifndef ADVERTISE_PAUSE typo David Hollis
2005-01-11 18:57 ` Jeff Garzik
2005-01-11 19:48 ` David Hollis
2005-01-11 20:07 ` Jeff Garzik
2005-01-27 22:17 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).