patch-1.3.11 linux/drivers/net/hp100.c

• Lines: 122
• Date: Fri Jul 14 07:24:58 1995
• Orig file: v1.3.10/linux/drivers/net/hp100.c
• Orig date: Fri Jul 7 08:54:47 1995

diff -u --recursive --new-file v1.3.10/linux/drivers/net/hp100.c linux/drivers/net/hp100.c
@@ -65,6 +65,7 @@
  *      0.11    14-Jun-95   Reset interface bug fixed?
  *			    Little bug in hp100_close function fixed.
  *                          100Mb/s connection debugged.
+ *      0.12    14-Jul-95   Link down is now handled better.
  *
  */
 
@@ -350,12 +351,6 @@
   int ioaddr = dev -> base_addr;
   struct hp100_private *lp = (struct hp100_private *)dev -> priv;
 
-  if ( ( lp -> lan_type = hp100_sense_lan( dev ) ) < 0 )
-    {
-      printk( "%s: no connection found - check wire\n", dev -> name );
-      return -EIO;
-    }
-
   if ( request_irq( dev -> irq, hp100_interrupt, SA_INTERRUPT, lp -> id -> name ) )
     {
       printk( "%s: unable to get IRQ %d\n", dev -> name, dev -> irq );
@@ -372,6 +367,7 @@
   dev -> interrupt = 0;
   dev -> start = 1;
 
+  lp -> lan_type = hp100_sense_lan( dev );
   lp -> mac1_mode = HP100_MAC1MODE3;
   lp -> mac2_mode = HP100_MAC2MODE3;
   
@@ -424,11 +420,11 @@
   struct hp100_private *lp = (struct hp100_private *)dev -> priv;
 
   hp100_page( PERFORMANCE );
-  hp100_outw( 0xfefe, IRQ_MASK );		/* mask off all ints */
+  hp100_outw( 0xfefe, IRQ_MASK );		/* mask off all IRQs */
 
-  hp100_stop_interface( dev );			/* relogin */
+  hp100_stop_interface( dev );
 
-  if ( lp -> lan_type == HP100_LAN_100 )
+  if ( lp -> lan_type == HP100_LAN_100 )	/* relogin */
     hp100_login_to_vg_hub( dev );
 
   dev -> tbusy = 1;
@@ -452,6 +448,20 @@
   int ioaddr = dev -> base_addr;
   u_short val;
   struct hp100_private *lp = (struct hp100_private *)dev -> priv;
+
+  if ( lp -> lan_type < 0 )
+    {
+      hp100_stop_interface( dev );
+      if ( ( lp -> lan_type = hp100_sense_lan( dev ) ) < 0 )
+        {
+          printk( "%s: no connection found - check wire\n", dev -> name );
+          hp100_start_interface( dev );	/* 10Mb/s RX packets maybe handled */
+          return -EIO;
+        }
+      if ( lp -> lan_type == HP100_LAN_100 )
+        lp -> hub_status = hp100_login_to_vg_hub( dev );
+      hp100_start_interface( dev );
+    }
   
   if ( ( i = ( hp100_inl( TX_MEM_FREE ) & ~0x7fffffff ) ) < skb -> len + 16 )
     {
@@ -463,11 +473,9 @@
  				/* 100Mb/s adapter isn't connected to hub */
         {
           printk( "%s: login to 100Mb/s hub retry\n", dev -> name );
-          hp100_ints_off();
           hp100_stop_interface( dev );
           lp -> hub_status = hp100_login_to_vg_hub( dev );
           hp100_start_interface( dev );
-          hp100_ints_on();
         }
        else
         {
@@ -483,20 +491,16 @@
               /* it's very heavy - all network setting must be changed!!! */
               printk( "%s: cable change 10Mb/s <-> 100Mb/s detected\n", dev -> name );
               lp -> lan_type = i;
-              hp100_ints_off();
               hp100_stop_interface( dev );
               if ( lp -> lan_type == HP100_LAN_100 )
                 lp -> hub_status = hp100_login_to_vg_hub( dev );
               hp100_start_interface( dev );
-              hp100_ints_on();
             }
            else
             {
               printk( "%s: interface reset\n", dev -> name );
-              hp100_ints_off();
               hp100_stop_interface( dev );
               hp100_start_interface( dev );
-              hp100_ints_on();
             }
         }
       dev -> trans_start = jiffies;
@@ -566,6 +570,15 @@
   u_int header;
   struct sk_buff *skb;
 
+#if 0
+  if ( lp -> lan_type < 0 )
+    {
+      if ( ( lp -> lan_type = hp100_sense_lan( dev ) ) == HP100_LAN_100 )
+        lp -> hub_status = hp100_login_to_vg_hub( dev );
+      hp100_page( PERFORMANCE );
+    }
+#endif
+  
   packets = hp100_inb( RX_PKT_CNT );
 #ifdef HP100_DEBUG
   if ( packets > 1 )
@@ -730,6 +743,7 @@
     printk( "%s: re-entering the interrupt handler\n", dev -> name );
   hp100_ints_off();
   dev -> interrupt = 1;
+  hp100_page( PERFORMANCE );
   val = hp100_inw( IRQ_STATUS );
 #ifdef HP100_DEBUG_IRQ
   printk( "hp100_interrupt: irq_status = 0x%x\n", val );