View | Details | Raw Unified
Collapse All | Expand All

(-) linux-2.6.17.orig/drivers/net/via-velocity.c (+6 lines)
 Lines 248-253    Link Here  
static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_info *);
static void velocity_free_tx_buf(struct velocity_info *vptr, struct velocity_td_info *);
static int velocity_soft_reset(struct velocity_info *vptr);
static int velocity_soft_reset(struct velocity_info *vptr);
static void mii_init(struct velocity_info *vptr, u32 mii_status);
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 u32 velocity_get_opt_media_mode(struct velocity_info *vptr);
static void velocity_print_link_status(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);
static void safe_disable_mii_autopoll(struct mac_regs __iomem * regs);
 Lines 798-803    Link Here  
	if (ret < 0)
	if (ret < 0)
		goto err_iounmap;
		goto err_iounmap;

            

              
              
	if (velocity_get_link(dev))

            

            

              
              
		netif_carrier_off(dev);

            

            

              
              

            

        
	velocity_print_info(vptr);
	velocity_print_info(vptr);

        
	pci_set_drvdata(pdev, dev);
	pci_set_drvdata(pdev, dev);

        
	
	

  

    

    

       Lines 1653-1660
       
    
  Link Here 
    

  

        

        
		if (linked) {
		if (linked) {

        
			vptr->mii_status &= ~VELOCITY_LINK_FAIL;
			vptr->mii_status &= ~VELOCITY_LINK_FAIL;

            

              
              
			netif_carrier_on(vptr->dev);

            

        
		} else {
		} else {

        
			vptr->mii_status |= VELOCITY_LINK_FAIL;
			vptr->mii_status |= VELOCITY_LINK_FAIL;

            

              
              
			netif_carrier_off(vptr->dev);

            

        
		}
		}

        

        
		velocity_print_link_status(vptr);
		velocity_print_link_status(vptr);