diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-02 22:24:01 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-02 22:24:01 +0000 |
commit | 06c8b90ebf32eacd45ff196c4c58e51ec7321868 (patch) | |
tree | 42bddd590a1d6f0a18365932658c37e660cc280b /target/linux/bcm53xx/patches-3.10/213-bgmac-add-support-for-Byte-Queue-Limits.patch | |
parent | 03b0c3b5a6f8c032ba10e1e1193eed1145a996c4 (diff) | |
download | mtk-20170518-06c8b90ebf32eacd45ff196c4c58e51ec7321868.zip mtk-20170518-06c8b90ebf32eacd45ff196c4c58e51ec7321868.tar.gz mtk-20170518-06c8b90ebf32eacd45ff196c4c58e51ec7321868.tar.bz2 |
kernel: bgmac: move bgmac patches already applied in mainline kernel to generic
The bgmac driver will be used on the brcm47xx and the bcm53xx target.
These are only the patches already applied in current net-next/master
branch.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38288
Diffstat (limited to 'target/linux/bcm53xx/patches-3.10/213-bgmac-add-support-for-Byte-Queue-Limits.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.10/213-bgmac-add-support-for-Byte-Queue-Limits.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/target/linux/bcm53xx/patches-3.10/213-bgmac-add-support-for-Byte-Queue-Limits.patch b/target/linux/bcm53xx/patches-3.10/213-bgmac-add-support-for-Byte-Queue-Limits.patch deleted file mode 100644 index 440461a..0000000 --- a/target/linux/bcm53xx/patches-3.10/213-bgmac-add-support-for-Byte-Queue-Limits.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Hauke Mehrtens <hauke@hauke-m.de> -bgmac: add support for Byte Queue Limits - ---- a/drivers/net/ethernet/broadcom/bgmac.c -+++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -183,6 +183,7 @@ static void bgmac_dma_tx_free(struct bgm - struct device *dma_dev = bgmac->core->dma_dev; - int empty_slot; - bool freed = false; -+ unsigned bytes_compl = 0, pkts_compl = 0; - - /* The last slot that hardware didn't consume yet */ - empty_slot = bgmac_read(bgmac, ring->mmio_base + BGMAC_DMA_TX_STATUS); -@@ -200,6 +201,9 @@ static void bgmac_dma_tx_free(struct bgm - slot->skb->len, DMA_TO_DEVICE); - slot->dma_addr = 0; - -+ bytes_compl += slot->skb->len; -+ pkts_compl++; -+ - /* Free memory! :) */ - dev_kfree_skb(slot->skb); - slot->skb = NULL; -@@ -213,6 +217,8 @@ static void bgmac_dma_tx_free(struct bgm - freed = true; - } - -+ netdev_completed_queue(bgmac->net_dev, pkts_compl, bytes_compl); -+ - if (freed && netif_queue_stopped(bgmac->net_dev)) - netif_wake_queue(bgmac->net_dev); - } -@@ -1013,6 +1019,8 @@ static void bgmac_chip_reset(struct bgma - bgmac_set(bgmac, BGMAC_PHY_CNTL, BGMAC_PC_MTE); - bgmac_miiconfig(bgmac); - bgmac_phy_init(bgmac); -+ -+ netdev_reset_queue(bgmac->net_dev); - - bgmac->int_status = 0; - } -@@ -1227,6 +1235,8 @@ static netdev_tx_t bgmac_start_xmit(stru - struct bgmac *bgmac = netdev_priv(net_dev); - struct bgmac_dma_ring *ring; - -+ netdev_sent_queue(net_dev, skb->len); -+ - /* No QOS support yet */ - ring = &bgmac->tx_ring[0]; - return bgmac_dma_tx_add(bgmac, ring, skb); |