The patch titled
orinoco: orinoco_xmit() should only return valid symbolic constants
has been removed from the -mm tree. Its filename is
orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Pavel Roskin <proski@xxxxxxx>
Don't ever return -errno from orinoco_xmit() - the network layer doesn't
expect it.
Signed-off-by: Pavel Roskin <proski@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/wireless/orinoco.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff -puN drivers/net/wireless/orinoco.c~orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants drivers/net/wireless/orinoco.c
--- 25/drivers/net/wireless/orinoco.c~orinoco-orinoco_xmit-should-only-return-valid-symbolic-constants Fri Apr 7 15:37:26 2006
+++ 25-akpm/drivers/net/wireless/orinoco.c Fri Apr 7 15:37:26 2006
@@ -430,19 +430,19 @@ static int orinoco_xmit(struct sk_buff *
if (! netif_running(dev)) {
printk(KERN_ERR "%s: Tx on stopped device!\n",
dev->name);
- return 1;
+ return NETDEV_TX_BUSY;
}
if (netif_queue_stopped(dev)) {
printk(KERN_DEBUG "%s: Tx while transmitter busy!\n",
dev->name);
- return 1;
+ return NETDEV_TX_BUSY;
}
if (orinoco_lock(priv, &flags) != 0) {
printk(KERN_ERR "%s: orinoco_xmit() called while hw_unavailable\n",
dev->name);
- return 1;
+ return NETDEV_TX_BUSY;
}
if (! netif_carrier_ok(dev) || (priv->iw_mode == IW_MODE_MONITOR)) {
@@ -452,7 +452,7 @@ static int orinoco_xmit(struct sk_buff *
stats->tx_errors++;
orinoco_unlock(priv, &flags);
dev_kfree_skb(skb);
- return 0;
+ return NETDEV_TX_OK;
}
/* Length of the packet body */
@@ -551,11 +551,11 @@ static int orinoco_xmit(struct sk_buff *
dev_kfree_skb(skb);
- return 0;
+ return NETDEV_TX_OK;
fail:
orinoco_unlock(priv, &flags);
- return err;
+ return NETDEV_TX_BUSY;
}
static void __orinoco_ev_alloc(struct net_device *dev, hermes_t *hw)
_
Patches currently in -mm which might be from proski@xxxxxxx are
origin.patch
git-wireless.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
