diff options
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r-- | drivers/net/tokenring/3c359.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/olympic.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/smctr.c | 2 | ||||
-rw-r--r-- | drivers/net/tokenring/tms380tr.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index 534c0f38483c..13dbc59bfe42 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
@@ -1243,7 +1243,7 @@ static int xl_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1243 | return 0; | 1243 | return 0; |
1244 | } else { | 1244 | } else { |
1245 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; | 1245 | spin_unlock_irqrestore(&xl_priv->xl_lock,flags) ; |
1246 | return 1; | 1246 | return NETDEV_TX_BUSY; |
1247 | } | 1247 | } |
1248 | 1248 | ||
1249 | } | 1249 | } |
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 2e70ee8f1459..b358bbbce33a 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -1187,7 +1187,7 @@ static int streamer_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1187 | } else { | 1187 | } else { |
1188 | netif_stop_queue(dev); | 1188 | netif_stop_queue(dev); |
1189 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); | 1189 | spin_unlock_irqrestore(&streamer_priv->streamer_lock,flags); |
1190 | return 1; | 1190 | return NETDEV_TX_BUSY; |
1191 | } | 1191 | } |
1192 | } | 1192 | } |
1193 | 1193 | ||
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index d068a9d36883..c36974925c15 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -1055,7 +1055,7 @@ static int olympic_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1055 | return 0; | 1055 | return 0; |
1056 | } else { | 1056 | } else { |
1057 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); | 1057 | spin_unlock_irqrestore(&olympic_priv->olympic_lock,flags); |
1058 | return 1; | 1058 | return NETDEV_TX_BUSY; |
1059 | } | 1059 | } |
1060 | 1060 | ||
1061 | } | 1061 | } |
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index a91d9c55d78e..54ad4ed03374 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
@@ -4601,7 +4601,7 @@ static int smctr_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
4601 | netif_stop_queue(dev); | 4601 | netif_stop_queue(dev); |
4602 | 4602 | ||
4603 | if(tp->QueueSkb == 0) | 4603 | if(tp->QueueSkb == 0) |
4604 | return (1); /* Return with tbusy set: queue full */ | 4604 | return NETDEV_TX_BUSY; /* Return with tbusy set: queue full */ |
4605 | 4605 | ||
4606 | tp->QueueSkb--; | 4606 | tp->QueueSkb--; |
4607 | skb_queue_tail(&tp->SendSkbQueue, skb); | 4607 | skb_queue_tail(&tp->SendSkbQueue, skb); |
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index b11bb72dc7ab..a2eab72b507a 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c | |||
@@ -633,7 +633,7 @@ static int tms380tr_hardware_send_packet(struct sk_buff *skb, struct net_device | |||
633 | if (tms380tr_debug > 0) | 633 | if (tms380tr_debug > 0) |
634 | printk(KERN_DEBUG "%s: No free TPL\n", dev->name); | 634 | printk(KERN_DEBUG "%s: No free TPL\n", dev->name); |
635 | spin_unlock_irqrestore(&tp->lock, flags); | 635 | spin_unlock_irqrestore(&tp->lock, flags); |
636 | return 1; | 636 | return NETDEV_TX_BUSY; |
637 | } | 637 | } |
638 | 638 | ||
639 | dmabuf = 0; | 639 | dmabuf = 0; |