[Gc-linux-cvs] linux/drivers/net/usb usbnet.c,1.2,1.3

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/net/usb
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10543/drivers/net/usb

Modified Files:
	usbnet.c 
Log Message:
Merge 2.6.29-rc7.


Index: usbnet.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/usb/usbnet.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usbnet.c	2 Mar 2009 18:08:43 -0000	1.2
--- usbnet.c	5 Mar 2009 19:58:46 -0000	1.3
***************
*** 726,731 ****
  		return mii_link_ok(&dev->mii);
  
! 	/* Otherwise, say we're up (to avoid breaking scripts) */
! 	return 1;
  }
  EXPORT_SYMBOL_GPL(usbnet_get_link);
--- 726,731 ----
  		return mii_link_ok(&dev->mii);
  
! 	/* Otherwise, dtrt for drivers calling netif_carrier_{on,off} */
! 	return ethtool_op_get_link(net);
  }
  EXPORT_SYMBOL_GPL(usbnet_get_link);