Commit 2812ab89 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: Remove STATUS enums from TX path

Returning standard error code or status variable.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/21bf299b-63e0-9f65-c7db-6e0b72e0f1d8@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b4922de
...@@ -256,15 +256,6 @@ struct vnt_interrupt_buffer { ...@@ -256,15 +256,6 @@ struct vnt_interrupt_buffer {
bool in_use; bool in_use;
}; };
/*++ NDIS related */
enum {
STATUS_SUCCESS = 0,
STATUS_FAILURE,
STATUS_RESOURCES,
STATUS_PENDING,
};
/* flags for options */ /* flags for options */
#define DEVICE_FLAGS_UNPLUG 0 #define DEVICE_FLAGS_UNPLUG 0
#define DEVICE_FLAGS_DISCONNECTED 1 #define DEVICE_FLAGS_DISCONNECTED 1
......
...@@ -704,7 +704,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) ...@@ -704,7 +704,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (vnt_tx_context(priv, tx_context) != STATUS_PENDING) { if (vnt_tx_context(priv, tx_context)) {
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
return -EIO; return -EIO;
} }
...@@ -797,7 +797,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb) ...@@ -797,7 +797,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb)
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (vnt_tx_context(priv, context) != STATUS_PENDING) if (vnt_tx_context(priv, context))
ieee80211_free_txskb(priv->hw, context->skb); ieee80211_free_txskb(priv->hw, context->skb);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
......
...@@ -317,7 +317,7 @@ int vnt_tx_context(struct vnt_private *priv, ...@@ -317,7 +317,7 @@ int vnt_tx_context(struct vnt_private *priv,
if (test_bit(DEVICE_FLAGS_DISCONNECTED, &priv->flags)) { if (test_bit(DEVICE_FLAGS_DISCONNECTED, &priv->flags)) {
context->in_use = false; context->in_use = false;
return STATUS_RESOURCES; return -ENODEV;
} }
usb_fill_bulk_urb(urb, usb_fill_bulk_urb(urb,
...@@ -333,8 +333,7 @@ int vnt_tx_context(struct vnt_private *priv, ...@@ -333,8 +333,7 @@ int vnt_tx_context(struct vnt_private *priv,
dev_dbg(&priv->usb->dev, "Submit Tx URB failed %d\n", status); dev_dbg(&priv->usb->dev, "Submit Tx URB failed %d\n", status);
context->in_use = false; context->in_use = false;
return STATUS_FAILURE;
} }
return STATUS_PENDING; return status;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment