Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
This commit is contained in:
@@ -226,17 +226,17 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
|
||||
priv->data_low_tx_full = 1;
|
||||
}
|
||||
|
||||
/* set the transmission time */
|
||||
ndev->trans_start = jiffies;
|
||||
priv->statistics.tx_packets++;
|
||||
priv->statistics.tx_bytes += skb->len;
|
||||
|
||||
/* trigger the device */
|
||||
islpci_trigger(priv);
|
||||
|
||||
/* unlock the driver code */
|
||||
spin_unlock_irqrestore(&priv->slock, flags);
|
||||
|
||||
/* set the transmission time */
|
||||
ndev->trans_start = jiffies;
|
||||
priv->statistics.tx_packets++;
|
||||
priv->statistics.tx_bytes += skb->len;
|
||||
|
||||
return 0;
|
||||
|
||||
drop_free:
|
||||
|
Reference in New Issue
Block a user