Automatic merge of /spare/repo/netdev-2.6 branch iff-running

diff --combined drivers/net/tlan.c
index 9680a308c62b1a69cc7926159ea85916a4a94e1b,ce116624f1362d7ef82e4eb756917621d3a66f51..cf31c0629852732defbf52d5ae4537325d1fc7e4
--- 1/drivers/net/tlan.c
--- 2/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@@ -193,12 -193,6 +193,12 @@@ static  int aui[MAX_TLAN_BOARDS]
  static  int duplex[MAX_TLAN_BOARDS];
  static  int speed[MAX_TLAN_BOARDS];
  static  int boards_found;
 +module_param_array(aui, int, NULL, 0);
 +module_param_array(duplex, int, NULL, 0);
 +module_param_array(speed, int, NULL, 0);
 +MODULE_PARM_DESC(aui, "ThunderLAN use AUI port(s) (0-1)");
 +MODULE_PARM_DESC(duplex, "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)");
 +MODULE_PARM_DESC(speed, "ThunderLAN port speen setting(s) (0,10,100)");
  
  MODULE_AUTHOR("Maintainer: Samuel Chessman <chessman@tux.org>");
  MODULE_DESCRIPTION("Driver for TI ThunderLAN based ethernet PCI adapters");
@@@ -210,13 -204,8 +210,13 @@@ MODULE_LICENSE("GPL")
  
  /* Turn on debugging. See Documentation/networking/tlan.txt for details */
  static  int           debug;
 +module_param(debug, int, 0);
 +MODULE_PARM_DESC(debug, "ThunderLAN debug mask");
  
  static        int             bbuf;
 +module_param(bbuf, int, 0);
 +MODULE_PARM_DESC(bbuf, "ThunderLAN use big buffer (0-1)");
 +
  static        u8              *TLanPadBuffer;
  static  dma_addr_t    TLanPadBufferDMA;
  static        char            TLanSignature[] = "TLAN";
@@@ -2392,7 -2381,6 +2392,7 @@@ TLan_FinishReset( struct net_device *de
                TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_FINISH_RESET );
                return;
        }
 +      TLan_SetMulticastList(dev);
  
  } /* TLan_FinishReset */
  
@@@ -2819,7 -2807,7 +2819,7 @@@ void TLan_PhyMonitor( struct net_devic
               if (priv->link) {
                      priv->link = 0;
                      printk(KERN_DEBUG "TLAN: %s has lost link\n", dev->name);
-                     dev->flags &= ~IFF_RUNNING;
+                     netif_carrier_off(dev);
                      TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
                      return;
                }
@@@ -2829,7 -2817,7 +2829,7 @@@
          if ((phy_status & MII_GS_LINK) && !priv->link) {
                priv->link = 1;
                printk(KERN_DEBUG "TLAN: %s has reestablished link\n", dev->name);
-               dev->flags |= IFF_RUNNING;
+               netif_carrier_on(dev);
          }
  
        /* Setup a new monitor */