From: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Thu, 2 Jul 2009 07:22:41 +0000 (-0700)
Subject: Fix usbnet.c hunks
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=77c19b5c9adc38029d26ad13ad52548faeb2e147;p=openwrt%2Fstaging%2Fblogic.git

Fix usbnet.c hunks

CONFIG_COMPAT_NET_DEV_OPS is now pointless since
all USB net drivers are now converted.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---

diff --git a/compat/compat.diff b/compat/compat.diff
index 0797d79529f5..e8748c2ddf78 100644
--- a/compat/compat.diff
+++ b/compat/compat.diff
@@ -105,9 +105,9 @@
  
  	retval = rndis_command(dev, u.header, CONTROL_BUFFER_SIZE);
  	if (unlikely(retval < 0)) {
---- a/drivers/net/usb/usbnet.c
-+++ b/drivers/net/usb/usbnet.c
-@@ -1120,6 +1120,7 @@ void usbnet_disconnect (struct usb_interface *intf)
+--- a/drivers/net/usb/usbnet.c	2009-07-02 00:16:46.300294574 -0700
++++ b/drivers/net/usb/usbnet.c	2009-07-02 00:20:34.717101235 -0700
+@@ -1151,6 +1151,7 @@
  }
  EXPORT_SYMBOL_GPL(usbnet_disconnect);
  
@@ -115,7 +115,7 @@
  static const struct net_device_ops usbnet_netdev_ops = {
  	.ndo_open		= usbnet_open,
  	.ndo_stop		= usbnet_stop,
-@@ -1129,6 +1130,7 @@ static const struct net_device_ops usbnet_netdev_ops = {
+@@ -1160,6 +1161,7 @@
  	.ndo_set_mac_address 	= eth_mac_addr,
  	.ndo_validate_addr	= eth_validate_addr,
  };
@@ -123,18 +123,22 @@
  
  /*-------------------------------------------------------------------------*/
  
-@@ -1198,8 +1200,10 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
+@@ -1229,7 +1231,15 @@
  		net->features |= NETIF_F_HIGHDMA;
  #endif
  
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
  	net->netdev_ops = &usbnet_netdev_ops;
--#ifdef CONFIG_COMPAT_NET_DEV_OPS
 +#else
 +	net->change_mtu = usbnet_change_mtu;
- 	net->hard_start_xmit = usbnet_start_xmit;
- 	net->open = usbnet_open;
- 	net->stop = usbnet_stop;
++	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;
+ 
 --- a/drivers/net/wireless/Makefile
 +++ b/drivers/net/wireless/Makefile
 @@ -5,43 +5,17 @@