diff options
author | Simone Willett <swillett@nvidia.com> | 2011-10-21 18:17:20 -0700 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2011-10-21 18:23:13 -0700 |
commit | 55073629e710c2b77fa122268b266a82e2270259 (patch) | |
tree | 7e62209d51a6617e2ee0971ecf504dbd3ae68b54 | |
parent | 635100905907657852ff7f81fffae2ff2e594e15 (diff) |
Revert "arm: tegra: comms: Fix RAW-IP rx after resume."
This reverts commit 6af7fd6d2d43455f2ca54dcacd2f46197410c578.
Change-Id: I839d0c4beba8c1fc432ff14b89cf0939004e1b30
Reviewed-on: http://git-master/r/59775
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
-rw-r--r--[-rwxr-xr-x] | drivers/net/usb/raw_ip_net.c | 64 |
1 files changed, 5 insertions, 59 deletions
diff --git a/drivers/net/usb/raw_ip_net.c b/drivers/net/usb/raw_ip_net.c index 08785e020076..b9f5d7229188 100755..100644 --- a/drivers/net/usb/raw_ip_net.c +++ b/drivers/net/usb/raw_ip_net.c @@ -33,7 +33,7 @@ #define BASEBAND_USB_NET_DEV_NAME "rmnet%d" /* ethernet packet ethertype for IP packets */ -#define NET_IP_ETHERTYPE 0x08, 0x00 +#define NET_IP_ETHERTYPE (0x08, 0x00) #define TX_TIMEOUT 10 @@ -89,10 +89,6 @@ static struct net_device *usb_net_raw_ip_dev[MAX_INTFS] = { 0, 0, 0}; static unsigned int g_usb_interface_index[MAX_INTFS]; static struct usb_interface *g_usb_interface[MAX_INTFS]; -static int usb_net_raw_ip_rx_urb_submit(struct baseband_usb *usb); -static void usb_net_raw_ip_rx_urb_comp(struct urb *urb); -static void usb_net_raw_ip_tx_urb_comp(struct urb *urb); - static int baseband_usb_driver_probe(struct usb_interface *intf, const struct usb_device_id *id) { @@ -138,58 +134,12 @@ static void baseband_usb_driver_disconnect(struct usb_interface *intf) static int baseband_usb_driver_suspend(struct usb_interface *intf, pm_message_t message) { - int i; - pr_debug("%s intf %p\n", __func__, intf); - - for (i = 0; i < MAX_INTFS; i++) { - pr_debug("[%d]\n", i); - if (!baseband_usb_net[i]) - continue; - if (baseband_usb_net[i]->usb.interface != intf) { - pr_debug("%p != %p\n", - baseband_usb_net[i]->usb.interface, intf); - continue; - } - if (!baseband_usb_net[i]->usb.rx_urb) { - pr_debug("rx_usb already killed\n"); - continue; - } - /* kill usb rx */ - usb_kill_urb(baseband_usb_net[i]->usb.rx_urb); - baseband_usb_net[i]->usb.rx_urb = (struct urb *) 0; - } - return 0; } - static int baseband_usb_driver_resume(struct usb_interface *intf) { - int i, err; - pr_debug("%s intf %p\n", __func__, intf); - - for (i = 0; i < MAX_INTFS; i++) { - pr_debug("[%d]\n", i); - if (!baseband_usb_net[i]) - continue; - if (baseband_usb_net[i]->usb.interface != intf) { - pr_debug("%p != %p\n", - baseband_usb_net[i]->usb.interface, intf); - continue; - } - if (baseband_usb_net[i]->usb.rx_urb) { - pr_debug("rx_usb already exists\n"); - continue; - } - /* start usb rx */ - err = usb_net_raw_ip_rx_urb_submit(baseband_usb_net[i]); - if (err < 0) { - pr_err("submit rx failed - err %d\n", err); - continue; - } - } - return 0; } static int baseband_usb_driver_reset_resume(struct usb_interface *intf) @@ -368,6 +318,10 @@ void baseband_usb_close(struct baseband_usb *usb) pr_debug("baseband_usb_close }\n"); } +static int usb_net_raw_ip_rx_urb_submit(struct baseband_usb *usb); +static void usb_net_raw_ip_rx_urb_comp(struct urb *urb); +static void usb_net_raw_ip_tx_urb_comp(struct urb *urb); + static int baseband_usb_netdev_init(struct net_device *dev) { pr_debug("baseband_usb_netdev_init\n"); @@ -494,7 +448,6 @@ static int usb_net_raw_ip_rx_urb_submit(struct baseband_usb *usb) urb->transfer_flags = 0; /* submit rx urb */ - usb_mark_last_busy(usb->usb.device); usb->usb.rx_urb = urb; err = usb_submit_urb(urb, GFP_ATOMIC); if (err < 0) { @@ -535,13 +488,6 @@ static void usb_net_raw_ip_rx_urb_comp(struct urb *urb) pr_err("no urb\n"); return; } - if (urb->status == -ENOENT) { - pr_info("rx urb killed\n"); - return; - } - if (urb->status) { - pr_info("rx urb status %d\n", urb->status); - } /* put rx urb data in rx buffer */ if (urb->actual_length) { |