The result of orinoco_xmit() can be OK, dropped packet and busy
transmitter. Rename labels accordingly. Increment stats->tx_errors in
one place. Increment stats->tx_dropped - nobody is doing it for us.
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
/* Oops, the firmware hasn't established a connection,
silently drop the packet (this seems to be the
safest approach). */
/* Oops, the firmware hasn't established a connection,
silently drop the packet (this seems to be the
safest approach). */
- stats->tx_errors++;
- orinoco_unlock(priv, &flags);
- dev_kfree_skb(skb);
- return NETDEV_TX_OK;
}
/* Check packet length */
data_len = skb->len;
if (data_len < ETH_HLEN)
}
/* Check packet length */
data_len = skb->len;
if (data_len < ETH_HLEN)
eh = (struct ethhdr *)skb->data;
eh = (struct ethhdr *)skb->data;
if (net_ratelimit())
printk(KERN_ERR "%s: Error %d writing Tx descriptor "
"to BAP\n", dev->name, err);
if (net_ratelimit())
printk(KERN_ERR "%s: Error %d writing Tx descriptor "
"to BAP\n", dev->name, err);
- stats->tx_errors++;
- goto fail;
}
/* Clear the 802.11 header and data length fields - some
}
/* Clear the 802.11 header and data length fields - some
if (net_ratelimit())
printk(KERN_ERR "%s: Error %d writing packet "
"header to BAP\n", dev->name, err);
if (net_ratelimit())
printk(KERN_ERR "%s: Error %d writing packet "
"header to BAP\n", dev->name, err);
- stats->tx_errors++;
- goto fail;
}
} else { /* IEEE 802.3 frame */
data_len = skb->len;
}
} else { /* IEEE 802.3 frame */
data_len = skb->len;
if (err) {
printk(KERN_ERR "%s: Error %d writing packet to BAP\n",
dev->name, err);
if (err) {
printk(KERN_ERR "%s: Error %d writing packet to BAP\n",
dev->name, err);
- stats->tx_errors++;
- goto fail;
}
/* Finally, we actually initiate the send */
}
/* Finally, we actually initiate the send */
if (net_ratelimit())
printk(KERN_ERR "%s: Error %d transmitting packet\n",
dev->name, err);
if (net_ratelimit())
printk(KERN_ERR "%s: Error %d transmitting packet\n",
dev->name, err);
- stats->tx_errors++;
- goto fail;
}
dev->trans_start = jiffies;
stats->tx_bytes += data_off + data_len;
}
dev->trans_start = jiffies;
stats->tx_bytes += data_off + data_len;
- orinoco_unlock(priv, &flags);
+ drop:
+ stats->tx_errors++;
+ stats->tx_dropped++;
+ ok:
+ orinoco_unlock(priv, &flags);
orinoco_unlock(priv, &flags);
return NETDEV_TX_BUSY;
}
orinoco_unlock(priv, &flags);
return NETDEV_TX_BUSY;
}