[Gc-linux-cvs] linux/drivers/net/usb usbnet.c,1.4,1.5

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

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

Modified Files:
	usbnet.c 
Log Message:
Forward to v.2.6.30.


Index: usbnet.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/usb/usbnet.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** usbnet.c	25 Oct 2009 18:33:47 -0000	1.4
--- usbnet.c	25 Oct 2009 18:45:36 -0000	1.5
***************
*** 224,228 ****
   *-------------------------------------------------------------------------*/
  
! static int usbnet_change_mtu (struct net_device *net, int new_mtu)
  {
  	struct usbnet	*dev = netdev_priv(net);
--- 224,228 ----
   *-------------------------------------------------------------------------*/
  
! int usbnet_change_mtu (struct net_device *net, int new_mtu)
  {
  	struct usbnet	*dev = netdev_priv(net);
***************
*** 247,258 ****
  	return 0;
  }
! 
! /*-------------------------------------------------------------------------*/
! 
! static struct net_device_stats *usbnet_get_stats (struct net_device *net)
! {
! 	struct usbnet	*dev = netdev_priv(net);
! 	return &dev->stats;
! }
  
  /*-------------------------------------------------------------------------*/
--- 247,251 ----
  	return 0;
  }
! EXPORT_SYMBOL_GPL(usbnet_change_mtu);
  
  /*-------------------------------------------------------------------------*/
***************
*** 549,553 ****
  // precondition: never called in_interrupt
  
! static int usbnet_stop (struct net_device *net)
  {
  	struct usbnet		*dev = netdev_priv(net);
--- 542,546 ----
  // precondition: never called in_interrupt
  
! int usbnet_stop (struct net_device *net)
  {
  	struct usbnet		*dev = netdev_priv(net);
***************
*** 593,596 ****
--- 586,590 ----
  	return 0;
  }
+ EXPORT_SYMBOL_GPL(usbnet_stop);
  
  /*-------------------------------------------------------------------------*/
***************
*** 600,604 ****
  // precondition: never called in_interrupt
  
! static int usbnet_open (struct net_device *net)
  {
  	struct usbnet		*dev = netdev_priv(net);
--- 594,598 ----
  // precondition: never called in_interrupt
  
! int usbnet_open (struct net_device *net)
  {
  	struct usbnet		*dev = netdev_priv(net);
***************
*** 675,678 ****
--- 669,673 ----
  	return retval;
  }
+ EXPORT_SYMBOL_GPL(usbnet_open);
  
  /*-------------------------------------------------------------------------*/
***************
*** 909,913 ****
  /*-------------------------------------------------------------------------*/
  
! static void usbnet_tx_timeout (struct net_device *net)
  {
  	struct usbnet		*dev = netdev_priv(net);
--- 904,908 ----
  /*-------------------------------------------------------------------------*/
  
! void usbnet_tx_timeout (struct net_device *net)
  {
  	struct usbnet		*dev = netdev_priv(net);
***************
*** 918,925 ****
  	// FIXME: device recovery -- reset?
  }
  
  /*-------------------------------------------------------------------------*/
  
! static int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)
  {
  	struct usbnet		*dev = netdev_priv(net);
--- 913,921 ----
  	// FIXME: device recovery -- reset?
  }
+ EXPORT_SYMBOL_GPL(usbnet_tx_timeout);
  
  /*-------------------------------------------------------------------------*/
  
! int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net)
  {
  	struct usbnet		*dev = netdev_priv(net);
***************
*** 1004,1008 ****
  	return retval;
  }
! 
  
  /*-------------------------------------------------------------------------*/
--- 1000,1004 ----
  	return retval;
  }
! EXPORT_SYMBOL_GPL(usbnet_start_xmit);
  
  /*-------------------------------------------------------------------------*/
***************
*** 1111,1114 ****
--- 1107,1119 ----
  EXPORT_SYMBOL_GPL(usbnet_disconnect);
  
+ static const struct net_device_ops usbnet_netdev_ops = {
+ 	.ndo_open		= usbnet_open,
+ 	.ndo_stop		= usbnet_stop,
+ 	.ndo_start_xmit		= usbnet_start_xmit,
+ 	.ndo_tx_timeout		= usbnet_tx_timeout,
+ 	.ndo_change_mtu		= usbnet_change_mtu,
+ 	.ndo_set_mac_address 	= eth_mac_addr,
+ 	.ndo_validate_addr	= eth_validate_addr,
+ };
  
  /*-------------------------------------------------------------------------*/
***************
*** 1176,1190 ****
  // dma_supported() is deeply broken on almost all architectures
  	// possible with some EHCI controllers
! 	if (dma_supported (&udev->dev, DMA_64BIT_MASK))
  		net->features |= NETIF_F_HIGHDMA;
  #endif
  
! 	net->change_mtu = usbnet_change_mtu;
! 	net->get_stats = usbnet_get_stats;
  	net->hard_start_xmit = usbnet_start_xmit;
  	net->open = usbnet_open;
  	net->stop = usbnet_stop;
- 	net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
  	net->tx_timeout = usbnet_tx_timeout;
  	net->ethtool_ops = &usbnet_ethtool_ops;
  
--- 1181,1196 ----
  // dma_supported() is deeply broken on almost all architectures
  	// possible with some EHCI controllers
! 	if (dma_supported (&udev->dev, DMA_BIT_MASK(64)))
  		net->features |= NETIF_F_HIGHDMA;
  #endif
  
! 	net->netdev_ops = &usbnet_netdev_ops;
! #ifdef CONFIG_COMPAT_NET_DEV_OPS
  	net->hard_start_xmit = usbnet_start_xmit;
  	net->open = usbnet_open;
  	net->stop = usbnet_stop;
  	net->tx_timeout = usbnet_tx_timeout;
+ #endif
+ 	net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
  	net->ethtool_ops = &usbnet_ethtool_ops;