Hi:
This patch should be applied on top of the previous two patches from me.
[KAWETH] Remove end attribute and term_wait
These are remnants of earlier RX/TX URB deletion notifications that
are now redundant and unused due to the introduction of usb_kill_urb.
The following patch removes them.
Signed-off-by: Herbert Xu <[EMAIL PROTECTED]>
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[EMAIL PROTECTED]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
@@ -218,7 +218,6 @@ struct kaweth_device
spinlock_t device_lock;
__u32 status;
- int end;
int suspend_lowmem_rx;
int suspend_lowmem_ctrl;
int linkstate;
@@ -226,7 +225,6 @@ struct kaweth_device
struct usb_device *dev;
struct net_device *net;
- wait_queue_head_t term_wait;
struct urb *rx_urb;
struct urb *tx_urb;
@@ -593,14 +591,6 @@ static void kaweth_usb_receive(struct ur
struct sk_buff *skb;
- if(unlikely(urb->status == -ECONNRESET || urb->status == -ESHUTDOWN))
- /* we are killed - set a flag and wake the disconnect handler */
- {
- kaweth->end = 1;
- wake_up(&kaweth->term_wait);
- return;
- }
-
if (kaweth->status & KAWETH_STATUS_CLOSING)
return;
@@ -779,7 +769,6 @@ static int kaweth_start_xmit(struct sk_b
skb->len,
kaweth_usb_transmit_complete,
kaweth);
- kaweth->end = 0;
if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC)))
{
@@ -916,7 +905,6 @@ static int kaweth_probe(
kaweth->net = netdev;
spin_lock_init(&kaweth->device_lock);
- init_waitqueue_head(&kaweth->term_wait);
kaweth_dbg("Resetting.");
