2013-09-18 15:19:25 +00:00
|
|
|
--- a/drivers/net/ethernet/broadcom/b44.c
|
|
|
|
|
+++ b/drivers/net/ethernet/broadcom/b44.c
|
2013-10-06 18:31:32 +00:00
|
|
|
@@ -596,6 +596,7 @@ static void b44_timer(unsigned long __op
|
2013-09-18 15:19:25 +00:00
|
|
|
static void b44_tx(struct b44 *bp)
|
|
|
|
|
{
|
|
|
|
|
u32 cur, cons;
|
|
|
|
|
+ unsigned bytes_compl = 0, pkts_compl = 0;
|
|
|
|
|
|
|
|
|
|
cur = br32(bp, B44_DMATX_STAT) & DMATX_STAT_CDMASK;
|
|
|
|
|
cur /= sizeof(struct dma_desc);
|
2013-10-06 18:31:32 +00:00
|
|
|
@@ -612,9 +613,14 @@ static void b44_tx(struct b44 *bp)
|
2013-09-18 15:19:25 +00:00
|
|
|
skb->len,
|
|
|
|
|
DMA_TO_DEVICE);
|
|
|
|
|
rp->skb = NULL;
|
|
|
|
|
+
|
|
|
|
|
+ bytes_compl += skb->len;
|
|
|
|
|
+ pkts_compl++;
|
|
|
|
|
+
|
|
|
|
|
dev_kfree_skb_irq(skb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ netdev_completed_queue(bp->dev, pkts_compl, bytes_compl);
|
|
|
|
|
bp->tx_cons = cons;
|
|
|
|
|
if (netif_queue_stopped(bp->dev) &&
|
|
|
|
|
TX_BUFFS_AVAIL(bp) > B44_TX_WAKEUP_THRESH)
|
2013-10-06 18:31:32 +00:00
|
|
|
@@ -1018,6 +1024,8 @@ static netdev_tx_t b44_start_xmit(struct
|
2013-09-18 15:19:25 +00:00
|
|
|
if (bp->flags & B44_FLAG_REORDER_BUG)
|
|
|
|
|
br32(bp, B44_DMATX_PTR);
|
|
|
|
|
|
|
|
|
|
+ netdev_sent_queue(dev, skb->len);
|
|
|
|
|
+
|
|
|
|
|
if (TX_BUFFS_AVAIL(bp) < 1)
|
|
|
|
|
netif_stop_queue(dev);
|
|
|
|
|
|
2013-10-06 18:31:32 +00:00
|
|
|
@@ -1416,6 +1424,8 @@ static void b44_init_hw(struct b44 *bp,
|
2013-09-18 15:19:25 +00:00
|
|
|
|
|
|
|
|
val = br32(bp, B44_ENET_CTRL);
|
|
|
|
|
bw32(bp, B44_ENET_CTRL, (val | ENET_CTRL_ENABLE));
|
2013-10-06 18:31:32 +00:00
|
|
|
+
|
2013-09-18 15:19:25 +00:00
|
|
|
+ netdev_reset_queue(bp->dev);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int b44_open(struct net_device *dev)
|
