Pull request for 'upstream' branch

Pull request for 'upstream' branch

[Francois Romieu]

Please pull from branch 'upstream' to get the change below:

git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git

Patch applies both to jeff#upstream and jeff#upstream-fixes

Shortlog
--------

Pedro Alejandro López-Valencia:
      sundance: PCI ID for ip100a


Patch
-----

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 61eec46..f13b2a1 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -94,11 +94,13 @@
 	Version LK1.10 (Philippe De Muyter phdm@macqel.be):
 	- Make 'unblock interface after Tx underrun' work
 
+	Version LK1.11 (Pedro Alejandro Lopez-Valencia palopezv at gmail.com):
+	- Add support for IC Plus Corporation IP100A chipset
 */
 
 #define DRV_NAME	"sundance"
-#define DRV_VERSION	"1.01+LK1.10"
-#define DRV_RELDATE	"28-Oct-2005"
+#define DRV_VERSION	"1.01+LK1.11"
+#define DRV_RELDATE	"14-Jun-2006"
 
 
 /* The user-configurable values.
@@ -287,6 +289,7 @@ static struct pci_device_id sundance_pci
 	{0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3},
 	{0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
 	{0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5},
+	{0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6},
 	{0,}
 };
 MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
@@ -305,6 +308,7 @@ static const struct pci_id_info pci_id_t
 	{"D-Link DFE-530TXS FAST Ethernet Adapter"},
 	{"D-Link DL10050-based FAST Ethernet Adapter"},
 	{"Sundance Technology Alta"},
+	{"IC Plus Corporation IP100A FAST Ethernet Adapter"},
 	{NULL,},			/* 0 terminated list. */
 };
 

Re: Pull request for 'upstream' branch

[Jeff Garzik]

Francois Romieu wrote:
> Please pull from branch 'upstream' to get the change below:
> 
> git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git
> 
> Patch applies both to jeff#upstream and jeff#upstream-fixes
> 
> Shortlog
> --------
> 
> Pedro Alejandro López-Valencia:
>       sundance: PCI ID for ip100a

pulled, thanks

Pull request for 'upstream' branch

[Francois Romieu]

Please pull from branch 'upstream' to get the change below:

git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git

Patch applies to jeff#upstream, jeff#upstream-fixes and jeff#upstream-linus.

Shortlog
--------

Roy Marples:
      via-velocity: the link is not correctly detected when the device starts
    
Patch
-----

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 2eb6b5f..09e05fe 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -248,6 +248,7 @@ static void velocity_free_rd_ring(struct
 static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_info *);
 static int velocity_soft_reset(struct velocity_info *vptr);
 static void mii_init(struct velocity_info *vptr, u32 mii_status);
+static u32 velocity_get_link(struct net_device *dev);
 static u32 velocity_get_opt_media_mode(struct velocity_info *vptr);
 static void velocity_print_link_status(struct velocity_info *vptr);
 static void safe_disable_mii_autopoll(struct mac_regs __iomem * regs);
@@ -798,6 +799,9 @@ #endif
 	if (ret < 0)
 		goto err_iounmap;
 
+	if (velocity_get_link(dev))
+		netif_carrier_off(dev);
+
 	velocity_print_info(vptr);
 	pci_set_drvdata(pdev, dev);
 	
@@ -1653,8 +1657,10 @@ static void velocity_error(struct veloci
 
 		if (linked) {
 			vptr->mii_status &= ~VELOCITY_LINK_FAIL;
+			netif_carrier_on(vptr->dev);
 		} else {
 			vptr->mii_status |= VELOCITY_LINK_FAIL;
+			netif_carrier_off(vptr->dev);
 		}
 
 		velocity_print_link_status(vptr);

Re: Pull request for 'upstream' branch

[Jeff Garzik]

Francois Romieu wrote:
> Please pull from branch 'upstream' to get the change below:
> 
> git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6.git
> 
> Patch applies to jeff#upstream, jeff#upstream-fixes and jeff#upstream-linus.

Pulled.

FWIW, netdev#upstream-linus should almost always be ignored, and 
netdev#upstream-fixes is only valid during a -rc cycle.  Until 
2.6.18-rc1 is released, everything goes into netdev#upstream.

	Jeff