diff options
Diffstat (limited to 'drivers/net/wireless/wavelan.c')
-rw-r--r-- | drivers/net/wireless/wavelan.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c index 3ab3eb957189..ab7fc5c0c8b4 100644 --- a/drivers/net/wireless/wavelan.c +++ b/drivers/net/wireless/wavelan.c | |||
@@ -2867,12 +2867,8 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev) | |||
2867 | spin_unlock_irqrestore(&lp->spinlock, flags); | 2867 | spin_unlock_irqrestore(&lp->spinlock, flags); |
2868 | /* Check that we can continue */ | 2868 | /* Check that we can continue */ |
2869 | if (lp->tx_n_in_use == (NTXBLOCKS - 1)) | 2869 | if (lp->tx_n_in_use == (NTXBLOCKS - 1)) |
2870 | return 1; | 2870 | return NETDEV_TX_BUSY; |
2871 | } | 2871 | } |
2872 | #ifdef DEBUG_TX_ERROR | ||
2873 | if (skb->next) | ||
2874 | printk(KERN_INFO "skb has next\n"); | ||
2875 | #endif | ||
2876 | 2872 | ||
2877 | /* Do we need some padding? */ | 2873 | /* Do we need some padding? */ |
2878 | /* Note : on wireless the propagation time is in the order of 1us, | 2874 | /* Note : on wireless the propagation time is in the order of 1us, |
@@ -2884,10 +2880,10 @@ static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev) | |||
2884 | skb_copy_from_linear_data(skb, data, skb->len); | 2880 | skb_copy_from_linear_data(skb, data, skb->len); |
2885 | /* Write packet on the card */ | 2881 | /* Write packet on the card */ |
2886 | if(wv_packet_write(dev, data, ETH_ZLEN)) | 2882 | if(wv_packet_write(dev, data, ETH_ZLEN)) |
2887 | return 1; /* We failed */ | 2883 | return NETDEV_TX_BUSY; /* We failed */ |
2888 | } | 2884 | } |
2889 | else if(wv_packet_write(dev, skb->data, skb->len)) | 2885 | else if(wv_packet_write(dev, skb->data, skb->len)) |
2890 | return 1; /* We failed */ | 2886 | return NETDEV_TX_BUSY; /* We failed */ |
2891 | 2887 | ||
2892 | 2888 | ||
2893 | dev_kfree_skb(skb); | 2889 | dev_kfree_skb(skb); |