Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 79018
b: refs/heads/master
c: 01affb6
h: refs/heads/master
v: v3
  • Loading branch information
Holger Schurig authored and David S. Miller committed Jan 28, 2008
1 parent 9ae221e commit bcb53e7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 91843463bc4ca5eb2be4b8b5c5efd474e0c56283
refs/heads/master: 01affb653077d8581552d566276b405237636e5c
8 changes: 4 additions & 4 deletions trunk/drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ static int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
int ret = 0;
struct lbs_private *priv = dev->priv;

lbs_deb_enter(LBS_DEB_NET);
lbs_deb_enter(LBS_DEB_TX);

if (priv->dnld_sent || priv->adapter->TxLockFlag) {
priv->stats.tx_dropped++;
Expand All @@ -535,7 +535,7 @@ static int lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (lbs_process_tx(priv, skb) == 0)
dev->trans_start = jiffies;
done:
lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret);
lbs_deb_leave_args(LBS_DEB_TX, "ret %d", ret);
return ret;
}

Expand Down Expand Up @@ -571,7 +571,7 @@ static int lbs_pre_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct lbs_private *priv = dev->priv;
int ret;

lbs_deb_enter(LBS_DEB_NET);
lbs_deb_enter(LBS_DEB_TX);

if (priv->adapter->monitormode != LBS_MONITOR_OFF) {
netif_stop_queue(dev);
Expand All @@ -581,7 +581,7 @@ static int lbs_pre_start_xmit(struct sk_buff *skb, struct net_device *dev)
UNSET_MESH_FRAME(skb);

ret = lbs_hard_start_xmit(skb, dev);
lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret);
lbs_deb_leave_args(LBS_DEB_TX, "ret %d", ret);
return ret;
}

Expand Down

0 comments on commit bcb53e7

Please sign in to comment.