diff options
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/kaweth.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index 7cb10a0a5316..3d0d0b0b37c5 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
@@ -36,7 +36,6 @@ | |||
36 | * Run test procedures | 36 | * Run test procedures |
37 | * Fix bugs from previous two steps | 37 | * Fix bugs from previous two steps |
38 | * Snoop other OSs for any tricks we're not doing | 38 | * Snoop other OSs for any tricks we're not doing |
39 | * SMP locking | ||
40 | * Reduce arbitrary timeouts | 39 | * Reduce arbitrary timeouts |
41 | * Smart multicast support | 40 | * Smart multicast support |
42 | * Temporary MAC change support | 41 | * Temporary MAC change support |
@@ -796,7 +795,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
796 | 795 | ||
797 | int res; | 796 | int res; |
798 | 797 | ||
799 | spin_lock(&kaweth->device_lock); | 798 | spin_lock_irq(&kaweth->device_lock); |
800 | 799 | ||
801 | kaweth_async_set_rx_mode(kaweth); | 800 | kaweth_async_set_rx_mode(kaweth); |
802 | netif_stop_queue(net); | 801 | netif_stop_queue(net); |
@@ -814,7 +813,7 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
814 | if (!copied_skb) { | 813 | if (!copied_skb) { |
815 | kaweth->stats.tx_errors++; | 814 | kaweth->stats.tx_errors++; |
816 | netif_start_queue(net); | 815 | netif_start_queue(net); |
817 | spin_unlock(&kaweth->device_lock); | 816 | spin_unlock_irq(&kaweth->device_lock); |
818 | return 0; | 817 | return 0; |
819 | } | 818 | } |
820 | } | 819 | } |
@@ -848,7 +847,7 @@ skip: | |||
848 | net->trans_start = jiffies; | 847 | net->trans_start = jiffies; |
849 | } | 848 | } |
850 | 849 | ||
851 | spin_unlock(&kaweth->device_lock); | 850 | spin_unlock_irq(&kaweth->device_lock); |
852 | 851 | ||
853 | return 0; | 852 | return 0; |
854 | } | 853 | } |