Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
Tom Rini wrote: There's too many things in here that've sat too long (I'd been hoping to just delete the driver, but that hasn't happened yet, so). A cobbled together list of changes is: - Update MDIO support for workqueues. - Make use of - Add RPX6 support. - Comment out set_multicast_list (broken). - Rework tx_ring stuff so we have tx_free, not tx_Full/n_pkts. - Other PHY updates/fixes. - Leo Li: Rework FCC clock configuration, make it easier. - 2.4 : VLAN header room, other misc bits. - Kill MII_REG_NNN in favor of defines from - DM9161 PHY support (2.4, Myself & [EMAIL PROTECTED]) - PQ2ADS and PQ2FADS support bits (Myself & [EMAIL PROTECTED] Please make sure I and netdev@oss.sgi.com are CC'd on all net driver patches. Also, it would be nice to move this into drivers/net/* Jeff - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
I concur, the two essential things in my patch (2.6 API change and fix for bug 4310) are already picked up in your patch. I could have replied earlier but I thought I would take an hour or two to run with your patch on my board. But that can wait since you guys seem to be in a hurry with a decision on this. Oray -Original Message- From: Tom Rini [mailto:[EMAIL PROTECTED] Sent: Wednesday, March 16, 2005 9:55 AM To: Bastos Fernandez Alexandre Cc: 'Andrew Morton'; linux-kernel@vger.kernel.org; Leo Li; Balasaygun, Oray (Oray) Subject: Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again On Wed, Mar 16, 2005 at 09:00:51AM +0100, Bastos Fernandez Alexandre wrote: > What can we do? > Has Oray's patch been commited? Or not yet? > > I suggest commiting all the changes in this driver from linuxppc tree to > linux tree > and after this ask Oray to test again the driver and submmit new patch. > Or ask Oray to submmit changes patch to linuxppc So, Oray's patch has two things in it, it looks like. The basic re-porting to 2.6 APIs, and support for the EON8260. The EON8260 changes should be a bit cleaner to redo after the patch I sent goes in as some of the other cleanups will help there. But I'd also like to see the full EON8260 changes :) The 2.6 API parts look close, but I went and expanded a good bit more on them. I'd like to drop Oray's patch for now, and have the EON8260 work be resubmitted to lkml/[EMAIL PROTECTED] -- Tom Rini http://gate.crashing.org/~trini/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
On Wed, Mar 16, 2005 at 09:00:51AM +0100, Bastos Fernandez Alexandre wrote: > What can we do? > Has Oray's patch been commited? Or not yet? > > I suggest commiting all the changes in this driver from linuxppc tree to > linux tree > and after this ask Oray to test again the driver and submmit new patch. > Or ask Oray to submmit changes patch to linuxppc So, Oray's patch has two things in it, it looks like. The basic re-porting to 2.6 APIs, and support for the EON8260. The EON8260 changes should be a bit cleaner to redo after the patch I sent goes in as some of the other cleanups will help there. But I'd also like to see the full EON8260 changes :) The 2.6 API parts look close, but I went and expanded a good bit more on them. I'd like to drop Oray's patch for now, and have the EON8260 work be resubmitted to lkml/[EMAIL PROTECTED] -- Tom Rini http://gate.crashing.org/~trini/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
What can we do? Has Oray's patch been commited? Or not yet? I suggest commiting all the changes in this driver from linuxppc tree to linux tree and after this ask Oray to test again the driver and submmit new patch. Or ask Oray to submmit changes patch to linuxppc Best regards, Alex > -Original Message- > From: Andrew Morton [SMTP:[EMAIL PROTECTED] > Sent: Wednesday, March 16, 2005 7:32 AM > To: Tom Rini > Cc: linux-kernel@vger.kernel.org; Leo Li; Alexandre Bastos; Balasaygun, > Oray (Oray) > Subject: Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function > again > > Tom Rini <[EMAIL PROTECTED]> wrote: > > > > There's too many things in here that've sat too long (I'd been hoping to > > just delete the driver, but that hasn't happened yet, so). A cobbled > > together list of changes is: > > > > - Update MDIO support for workqueues. > > - Make use of > > - Add RPX6 support. > > - Comment out set_multicast_list (broken). > > - Rework tx_ring stuff so we have tx_free, not tx_Full/n_pkts. > > - Other PHY updates/fixes. > > - Leo Li: Rework FCC clock configuration, make it easier. > > - 2.4 : VLAN header room, other misc bits. > > - Kill MII_REG_NNN in favor of defines from > > - DM9161 PHY support (2.4, Myself & [EMAIL PROTECTED]) > > - PQ2ADS and PQ2FADS support bits (Myself & [EMAIL PROTECTED] > > > > From: Leo Li <[EMAIL PROTECTED]> > > Signed-off-by: Tom Rini <[EMAIL PROTECTED]> > > Signed-off-by: Alexandre Bastos <[EMAIL PROTECTED]> > > That's unfortunate - Oray sent a patch in just a few days ago which also > fixes up this driver. See > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.1 > 1-mm3/broken-out/ppc-8260-fcc-ethernet-driver-cannot-read-lxt971-phy-id.pa > tch > > What should we do? - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
What can we do? Has Oray's patch been commited? Or not yet? I suggest commiting all the changes in this driver from linuxppc tree to linux tree and after this ask Oray to test again the driver and submmit new patch. Or ask Oray to submmit changes patch to linuxppc Best regards, Alex -Original Message- From: Andrew Morton [SMTP:[EMAIL PROTECTED] Sent: Wednesday, March 16, 2005 7:32 AM To: Tom Rini Cc: linux-kernel@vger.kernel.org; Leo Li; Alexandre Bastos; Balasaygun, Oray (Oray) Subject: Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again Tom Rini [EMAIL PROTECTED] wrote: There's too many things in here that've sat too long (I'd been hoping to just delete the driver, but that hasn't happened yet, so). A cobbled together list of changes is: - Update MDIO support for workqueues. - Make use of linux/mii.h - Add RPX6 support. - Comment out set_multicast_list (broken). - Rework tx_ring stuff so we have tx_free, not tx_Full/n_pkts. - Other PHY updates/fixes. - Leo Li: Rework FCC clock configuration, make it easier. - 2.4 : VLAN header room, other misc bits. - Kill MII_REG_NNN in favor of defines from linux/mii.h - DM9161 PHY support (2.4, Myself [EMAIL PROTECTED]) - PQ2ADS and PQ2FADS support bits (Myself [EMAIL PROTECTED] From: Leo Li [EMAIL PROTECTED] Signed-off-by: Tom Rini [EMAIL PROTECTED] Signed-off-by: Alexandre Bastos [EMAIL PROTECTED] That's unfortunate - Oray sent a patch in just a few days ago which also fixes up this driver. See ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.1 1-mm3/broken-out/ppc-8260-fcc-ethernet-driver-cannot-read-lxt971-phy-id.pa tch What should we do? - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
On Wed, Mar 16, 2005 at 09:00:51AM +0100, Bastos Fernandez Alexandre wrote: What can we do? Has Oray's patch been commited? Or not yet? I suggest commiting all the changes in this driver from linuxppc tree to linux tree and after this ask Oray to test again the driver and submmit new patch. Or ask Oray to submmit changes patch to linuxppc So, Oray's patch has two things in it, it looks like. The basic re-porting to 2.6 APIs, and support for the EON8260. The EON8260 changes should be a bit cleaner to redo after the patch I sent goes in as some of the other cleanups will help there. But I'd also like to see the full EON8260 changes :) The 2.6 API parts look close, but I went and expanded a good bit more on them. I'd like to drop Oray's patch for now, and have the EON8260 work be resubmitted to lkml/[EMAIL PROTECTED] -- Tom Rini http://gate.crashing.org/~trini/ - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
I concur, the two essential things in my patch (2.6 API change and fix for bug 4310) are already picked up in your patch. I could have replied earlier but I thought I would take an hour or two to run with your patch on my board. But that can wait since you guys seem to be in a hurry with a decision on this. Oray -Original Message- From: Tom Rini [mailto:[EMAIL PROTECTED] Sent: Wednesday, March 16, 2005 9:55 AM To: Bastos Fernandez Alexandre Cc: 'Andrew Morton'; linux-kernel@vger.kernel.org; Leo Li; Balasaygun, Oray (Oray) Subject: Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again On Wed, Mar 16, 2005 at 09:00:51AM +0100, Bastos Fernandez Alexandre wrote: What can we do? Has Oray's patch been commited? Or not yet? I suggest commiting all the changes in this driver from linuxppc tree to linux tree and after this ask Oray to test again the driver and submmit new patch. Or ask Oray to submmit changes patch to linuxppc So, Oray's patch has two things in it, it looks like. The basic re-porting to 2.6 APIs, and support for the EON8260. The EON8260 changes should be a bit cleaner to redo after the patch I sent goes in as some of the other cleanups will help there. But I'd also like to see the full EON8260 changes :) The 2.6 API parts look close, but I went and expanded a good bit more on them. I'd like to drop Oray's patch for now, and have the EON8260 work be resubmitted to lkml/[EMAIL PROTECTED] -- Tom Rini http://gate.crashing.org/~trini/ - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
Tom Rini wrote: There's too many things in here that've sat too long (I'd been hoping to just delete the driver, but that hasn't happened yet, so). A cobbled together list of changes is: - Update MDIO support for workqueues. - Make use of linux/mii.h - Add RPX6 support. - Comment out set_multicast_list (broken). - Rework tx_ring stuff so we have tx_free, not tx_Full/n_pkts. - Other PHY updates/fixes. - Leo Li: Rework FCC clock configuration, make it easier. - 2.4 : VLAN header room, other misc bits. - Kill MII_REG_NNN in favor of defines from linux/mii.h - DM9161 PHY support (2.4, Myself [EMAIL PROTECTED]) - PQ2ADS and PQ2FADS support bits (Myself [EMAIL PROTECTED] Please make sure I and netdev@oss.sgi.com are CC'd on all net driver patches. Also, it would be nice to move this into drivers/net/* Jeff - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
Tom Rini <[EMAIL PROTECTED]> wrote: > > There's too many things in here that've sat too long (I'd been hoping to > just delete the driver, but that hasn't happened yet, so). A cobbled > together list of changes is: > > - Update MDIO support for workqueues. > - Make use of > - Add RPX6 support. > - Comment out set_multicast_list (broken). > - Rework tx_ring stuff so we have tx_free, not tx_Full/n_pkts. > - Other PHY updates/fixes. > - Leo Li: Rework FCC clock configuration, make it easier. > - 2.4 : VLAN header room, other misc bits. > - Kill MII_REG_NNN in favor of defines from > - DM9161 PHY support (2.4, Myself & [EMAIL PROTECTED]) > - PQ2ADS and PQ2FADS support bits (Myself & [EMAIL PROTECTED] > > From: Leo Li <[EMAIL PROTECTED]> > Signed-off-by: Tom Rini <[EMAIL PROTECTED]> > Signed-off-by: Alexandre Bastos <[EMAIL PROTECTED]> That's unfortunate - Oray sent a patch in just a few days ago which also fixes up this driver. See ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm3/broken-out/ppc-8260-fcc-ethernet-driver-cannot-read-lxt971-phy-id.patch What should we do? - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
There's too many things in here that've sat too long (I'd been hoping to just delete the driver, but that hasn't happened yet, so). A cobbled together list of changes is: - Update MDIO support for workqueues. - Make use of - Add RPX6 support. - Comment out set_multicast_list (broken). - Rework tx_ring stuff so we have tx_free, not tx_Full/n_pkts. - Other PHY updates/fixes. - Leo Li: Rework FCC clock configuration, make it easier. - 2.4 : VLAN header room, other misc bits. - Kill MII_REG_NNN in favor of defines from - DM9161 PHY support (2.4, Myself & [EMAIL PROTECTED]) - PQ2ADS and PQ2FADS support bits (Myself & [EMAIL PROTECTED] From: Leo Li <[EMAIL PROTECTED]> Signed-off-by: Tom Rini <[EMAIL PROTECTED]> Signed-off-by: Alexandre Bastos <[EMAIL PROTECTED]> arch/ppc/8260_io/Kconfig| 11 arch/ppc/8260_io/fcc_enet.c | 969 +--- include/asm-ppc/cpm2.h |1 3 files changed, 301 insertions(+), 680 deletions(-) --- linuxppc-2.6.11/arch/ppc/8260_io/Kconfig2005-03-15 09:00:42.0 -0700 +++ linux-2.6.11/arch/ppc/8260_io/Kconfig 2005-03-02 00:38:26.0 -0700 @@ -42,7 +42,7 @@ choice prompt "Type of PHY" depends on 8260 && USE_MDIO - default FCC_GENERIC_PHY + default FCC_LXT971 config FCC_LXT970 bool "LXT970" @@ -53,13 +53,6 @@ config FCC_QS6612 bool "QS6612" -config FCC_DM9131 - bool "DM9131" - -config FCC_DM9161 - bool "DM9161" - -config FCC_GENERIC_PHY - bool "Generic" endchoice endmenu + --- linuxppc-2.6.11/arch/ppc/8260_io/fcc_enet.c 2005-03-15 08:57:26.0 -0700 +++ linux-2.6.11/arch/ppc/8260_io/fcc_enet.c2005-03-02 00:38:08.0 -0700 @@ -16,9 +16,6 @@ * small packets. Since this is a cache coherent processor and CPM, * I could also preallocate SKB's and use them directly on the interface. * - * 2004-12 Leo Li ([EMAIL PROTECTED]) - * - Rework the FCC clock configuration part, make it easier to configure. - * */ #include @@ -37,8 +34,6 @@ #include #include #include -#include -#include #include #include @@ -46,26 +41,6 @@ #include #include #include -#include - -/* We can't use the PHY interrupt if we aren't using MDIO. */ -#if !defined(CONFIG_USE_MDIO) -#undef PHY_INTERRUPT -#endif - -/* If we have a PHY interrupt, we will advertise both full-duplex and half- - * duplex capabilities. If we don't have a PHY interrupt, then we will only - * advertise half-duplex capabilities. - */ -#define MII_ADVERTISE_HALF (ADVERTISE_100HALF | ADVERTISE_10HALF | \ -ADVERTISE_CSMA) -#define MII_ADVERTISE_ALL (ADVERTISE_100FULL | ADVERTISE_10FULL | \ -MII_ADVERTISE_HALF) -#ifdef PHY_INTERRUPT -#define MII_ADVERTISE_DEFAULT MII_ADVERTISE_ALL -#else -#define MII_ADVERTISE_DEFAULT MII_ADVERTISE_HALF -#endif #include /* The transmitter timeout @@ -90,6 +65,18 @@ const phy_cmd_t *shutdown; } phy_info_t; +/* Register definitions for the PHY. */ + +#define MII_REG_CR 0 /* Control Register */ +#define MII_REG_SR 1 /* Status Register */ +#define MII_REG_PHYIR1 2 /* PHY Identification Register 1*/ +#define MII_REG_PHYIR2 3 /* PHY Identification Register 2*/ +#define MII_REG_ANAR4 /* A-N Advertisement Register */ +#define MII_REG_ANLPAR 5 /* A-N Link Partner Ability Register*/ +#define MII_REG_ANER6 /* A-N Expansion Register */ +#define MII_REG_ANNPTR 7 /* A-N Next Page Transmit Register */ +#define MII_REG_ANLPRNPR8 /* A-N Link Partner Received Next Page Reg. */ + /* values for phy_status */ #define PHY_CONF_ANE 0x0001 /* 1 auto-negotiation enabled */ @@ -124,15 +111,13 @@ #define TX_RING_MOD_MASK 15 /* for this to work */ /* The FCC stores dest/src/type, data, and checksum for receive packets. - * size includes support for VLAN */ -#define PKT_MAXBUF_SIZE1522 +#define PKT_MAXBUF_SIZE1518 #define PKT_MINBUF_SIZE64 /* Maximum input DMA size. Must be a should(?) be a multiple of 4. - * size includes support for VLAN - */ -#define PKT_MAXDMA_SIZE1524 +*/ +#define PKT_MAXDMA_SIZE1520 /* Maximum input buffer size. Must be a multiple of 32. */ @@ -144,9 +129,8 @@ static irqreturn_t fcc_enet_interrupt(int irq, void *dev_id, struct pt_regs *); static int fcc_enet_close(struct net_device *dev); static struct net_device_stats *fcc_enet_get_stats(struct net_device *dev); -/* static void set_multicast_list(struct net_device *dev); */ +static void set_multicast_list(struct net_device *dev); static void fcc_restart(struct net_device *dev, int duplex); -static void fcc_stop(struct net_device *dev); static int fcc_enet_set_mac_address(struct net_device
[PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
There's too many things in here that've sat too long (I'd been hoping to just delete the driver, but that hasn't happened yet, so). A cobbled together list of changes is: - Update MDIO support for workqueues. - Make use of linux/mii.h - Add RPX6 support. - Comment out set_multicast_list (broken). - Rework tx_ring stuff so we have tx_free, not tx_Full/n_pkts. - Other PHY updates/fixes. - Leo Li: Rework FCC clock configuration, make it easier. - 2.4 : VLAN header room, other misc bits. - Kill MII_REG_NNN in favor of defines from linux/mii.h - DM9161 PHY support (2.4, Myself [EMAIL PROTECTED]) - PQ2ADS and PQ2FADS support bits (Myself [EMAIL PROTECTED] From: Leo Li [EMAIL PROTECTED] Signed-off-by: Tom Rini [EMAIL PROTECTED] Signed-off-by: Alexandre Bastos [EMAIL PROTECTED] arch/ppc/8260_io/Kconfig| 11 arch/ppc/8260_io/fcc_enet.c | 969 +--- include/asm-ppc/cpm2.h |1 3 files changed, 301 insertions(+), 680 deletions(-) --- linuxppc-2.6.11/arch/ppc/8260_io/Kconfig2005-03-15 09:00:42.0 -0700 +++ linux-2.6.11/arch/ppc/8260_io/Kconfig 2005-03-02 00:38:26.0 -0700 @@ -42,7 +42,7 @@ choice prompt Type of PHY depends on 8260 USE_MDIO - default FCC_GENERIC_PHY + default FCC_LXT971 config FCC_LXT970 bool LXT970 @@ -53,13 +53,6 @@ config FCC_QS6612 bool QS6612 -config FCC_DM9131 - bool DM9131 - -config FCC_DM9161 - bool DM9161 - -config FCC_GENERIC_PHY - bool Generic endchoice endmenu + --- linuxppc-2.6.11/arch/ppc/8260_io/fcc_enet.c 2005-03-15 08:57:26.0 -0700 +++ linux-2.6.11/arch/ppc/8260_io/fcc_enet.c2005-03-02 00:38:08.0 -0700 @@ -16,9 +16,6 @@ * small packets. Since this is a cache coherent processor and CPM, * I could also preallocate SKB's and use them directly on the interface. * - * 2004-12 Leo Li ([EMAIL PROTECTED]) - * - Rework the FCC clock configuration part, make it easier to configure. - * */ #include linux/config.h @@ -37,8 +34,6 @@ #include linux/etherdevice.h #include linux/skbuff.h #include linux/spinlock.h -#include linux/mii.h -#include linux/workqueue.h #include linux/bitops.h #include asm/immap_cpm2.h @@ -46,26 +41,6 @@ #include asm/mpc8260.h #include asm/irq.h #include asm/uaccess.h -#include asm/signal.h - -/* We can't use the PHY interrupt if we aren't using MDIO. */ -#if !defined(CONFIG_USE_MDIO) -#undef PHY_INTERRUPT -#endif - -/* If we have a PHY interrupt, we will advertise both full-duplex and half- - * duplex capabilities. If we don't have a PHY interrupt, then we will only - * advertise half-duplex capabilities. - */ -#define MII_ADVERTISE_HALF (ADVERTISE_100HALF | ADVERTISE_10HALF | \ -ADVERTISE_CSMA) -#define MII_ADVERTISE_ALL (ADVERTISE_100FULL | ADVERTISE_10FULL | \ -MII_ADVERTISE_HALF) -#ifdef PHY_INTERRUPT -#define MII_ADVERTISE_DEFAULT MII_ADVERTISE_ALL -#else -#define MII_ADVERTISE_DEFAULT MII_ADVERTISE_HALF -#endif #include asm/cpm2.h /* The transmitter timeout @@ -90,6 +65,18 @@ const phy_cmd_t *shutdown; } phy_info_t; +/* Register definitions for the PHY. */ + +#define MII_REG_CR 0 /* Control Register */ +#define MII_REG_SR 1 /* Status Register */ +#define MII_REG_PHYIR1 2 /* PHY Identification Register 1*/ +#define MII_REG_PHYIR2 3 /* PHY Identification Register 2*/ +#define MII_REG_ANAR4 /* A-N Advertisement Register */ +#define MII_REG_ANLPAR 5 /* A-N Link Partner Ability Register*/ +#define MII_REG_ANER6 /* A-N Expansion Register */ +#define MII_REG_ANNPTR 7 /* A-N Next Page Transmit Register */ +#define MII_REG_ANLPRNPR8 /* A-N Link Partner Received Next Page Reg. */ + /* values for phy_status */ #define PHY_CONF_ANE 0x0001 /* 1 auto-negotiation enabled */ @@ -124,15 +111,13 @@ #define TX_RING_MOD_MASK 15 /* for this to work */ /* The FCC stores dest/src/type, data, and checksum for receive packets. - * size includes support for VLAN */ -#define PKT_MAXBUF_SIZE1522 +#define PKT_MAXBUF_SIZE1518 #define PKT_MINBUF_SIZE64 /* Maximum input DMA size. Must be a should(?) be a multiple of 4. - * size includes support for VLAN - */ -#define PKT_MAXDMA_SIZE1524 +*/ +#define PKT_MAXDMA_SIZE1520 /* Maximum input buffer size. Must be a multiple of 32. */ @@ -144,9 +129,8 @@ static irqreturn_t fcc_enet_interrupt(int irq, void *dev_id, struct pt_regs *); static int fcc_enet_close(struct net_device *dev); static struct net_device_stats *fcc_enet_get_stats(struct net_device *dev); -/* static void set_multicast_list(struct net_device *dev); */ +static void set_multicast_list(struct
Re: [PATCH] ppc32: Update 8260_io/fcc_enet.c to function again
Tom Rini [EMAIL PROTECTED] wrote: There's too many things in here that've sat too long (I'd been hoping to just delete the driver, but that hasn't happened yet, so). A cobbled together list of changes is: - Update MDIO support for workqueues. - Make use of linux/mii.h - Add RPX6 support. - Comment out set_multicast_list (broken). - Rework tx_ring stuff so we have tx_free, not tx_Full/n_pkts. - Other PHY updates/fixes. - Leo Li: Rework FCC clock configuration, make it easier. - 2.4 : VLAN header room, other misc bits. - Kill MII_REG_NNN in favor of defines from linux/mii.h - DM9161 PHY support (2.4, Myself [EMAIL PROTECTED]) - PQ2ADS and PQ2FADS support bits (Myself [EMAIL PROTECTED] From: Leo Li [EMAIL PROTECTED] Signed-off-by: Tom Rini [EMAIL PROTECTED] Signed-off-by: Alexandre Bastos [EMAIL PROTECTED] That's unfortunate - Oray sent a patch in just a few days ago which also fixes up this driver. See ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm3/broken-out/ppc-8260-fcc-ethernet-driver-cannot-read-lxt971-phy-id.patch What should we do? - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
