|  | @@ -109,18 +109,6 @@ e1000_irq_disable ( struct e1000_adapter *adapter )
 | 
		
	
		
			
			| 109 | 109 |  	E1000_WRITE_FLUSH ( &adapter->hw );
 | 
		
	
		
			
			| 110 | 110 |  }
 | 
		
	
		
			
			| 111 | 111 |  
 | 
		
	
		
			
			| 112 |  | -/**
 | 
		
	
		
			
			| 113 |  | - * e1000_irq_force - trigger interrupt
 | 
		
	
		
			
			| 114 |  | - *
 | 
		
	
		
			
			| 115 |  | - * @v adapter	e1000 private structure
 | 
		
	
		
			
			| 116 |  | - **/
 | 
		
	
		
			
			| 117 |  | -static void
 | 
		
	
		
			
			| 118 |  | -e1000_irq_force ( struct e1000_adapter *adapter )
 | 
		
	
		
			
			| 119 |  | -{
 | 
		
	
		
			
			| 120 |  | -	E1000_WRITE_REG ( &adapter->hw, ICS, E1000_ICS_RXDMT0 );
 | 
		
	
		
			
			| 121 |  | -	E1000_WRITE_FLUSH ( &adapter->hw );
 | 
		
	
		
			
			| 122 |  | -}
 | 
		
	
		
			
			| 123 |  | -
 | 
		
	
		
			
			| 124 | 112 |  /**
 | 
		
	
		
			
			| 125 | 113 |   * e1000_sw_init - Initialize general software structures (struct e1000_adapter)
 | 
		
	
		
			
			| 126 | 114 |   *
 | 
		
	
	
		
			
			|  | @@ -813,18 +801,11 @@ e1000_irq ( struct net_device *netdev, int enable )
 | 
		
	
		
			
			| 813 | 801 |  	struct e1000_adapter *adapter = netdev_priv(netdev);
 | 
		
	
		
			
			| 814 | 802 |  
 | 
		
	
		
			
			| 815 | 803 |  	DBG ( "e1000_irq\n" );
 | 
		
	
		
			
			| 816 |  | -	
 | 
		
	
		
			
			| 817 |  | -	switch ( enable ) {
 | 
		
	
		
			
			| 818 |  | -	case 0 :
 | 
		
	
		
			
			| 819 |  | -		e1000_irq_disable ( adapter );
 | 
		
	
		
			
			| 820 |  | -		break;
 | 
		
	
		
			
			| 821 |  | -	case 1 :
 | 
		
	
		
			
			|  | 804 | +
 | 
		
	
		
			
			|  | 805 | +	if ( enable )
 | 
		
	
		
			
			| 822 | 806 |  		e1000_irq_enable ( adapter );
 | 
		
	
		
			
			| 823 |  | -		break;
 | 
		
	
		
			
			| 824 |  | -	case 2 :
 | 
		
	
		
			
			| 825 |  | -		e1000_irq_force ( adapter );
 | 
		
	
		
			
			| 826 |  | -		break;
 | 
		
	
		
			
			| 827 |  | -	}
 | 
		
	
		
			
			|  | 807 | +	else
 | 
		
	
		
			
			|  | 808 | +		e1000_irq_disable ( adapter );
 | 
		
	
		
			
			| 828 | 809 |  }
 | 
		
	
		
			
			| 829 | 810 |  
 | 
		
	
		
			
			| 830 | 811 |  static struct net_device_operations e1000_operations;
 |