diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 17:32:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 17:32:33 +0000 |
| commit | 1bf8e555bb3466baf775113ab27aa8f05f0e6aa7 (patch) | |
| tree | 741d4683dc45fdeba55701fe6b1d03186a5eacd0 /target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch | |
| parent | 24e9f521068575a0670028f21fe0323461f80bf1 (diff) | |
| download | upstream-1bf8e555bb3466baf775113ab27aa8f05f0e6aa7.tar.gz upstream-1bf8e555bb3466baf775113ab27aa8f05f0e6aa7.tar.bz2 upstream-1bf8e555bb3466baf775113ab27aa8f05f0e6aa7.zip | |
kernel: sync bgmac changes with latest upstream submission
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45420
Diffstat (limited to 'target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch b/target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch index 7525b63d6a..6709aaa4ea 100644 --- a/target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch +++ b/target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch @@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> ctl0 |= BGMAC_DESC_CTL0_EOT; ctl1 |= BGMAC_RX_BUF_SIZE & BGMAC_DESC_CTL1_LEN; /* Is there any BGMAC device that requires extension? */ -@@ -508,7 +508,7 @@ static void bgmac_dma_tx_ring_free(struc +@@ -504,7 +504,7 @@ static void bgmac_dma_tx_ring_free(struc struct bgmac_slot_info *slot; int i; @@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> int len = dma_desc[i].ctl1 & BGMAC_DESC_CTL1_LEN; slot = &ring->slots[i]; -@@ -533,7 +533,7 @@ static void bgmac_dma_rx_ring_free(struc +@@ -529,7 +529,7 @@ static void bgmac_dma_rx_ring_free(struc struct bgmac_slot_info *slot; int i; @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> slot = &ring->slots[i]; if (!slot->buf) continue; -@@ -547,7 +547,8 @@ static void bgmac_dma_rx_ring_free(struc +@@ -543,7 +543,8 @@ static void bgmac_dma_rx_ring_free(struc } static void bgmac_dma_ring_desc_free(struct bgmac *bgmac, @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> { struct device *dma_dev = bgmac->core->dma_dev; int size; -@@ -556,7 +557,7 @@ static void bgmac_dma_ring_desc_free(str +@@ -552,7 +553,7 @@ static void bgmac_dma_ring_desc_free(str return; /* Free ring of descriptors */ @@ -65,7 +65,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> dma_free_coherent(dma_dev, size, ring->cpu_base, ring->dma_base); } -@@ -577,10 +578,12 @@ static void bgmac_dma_free(struct bgmac +@@ -573,10 +574,12 @@ static void bgmac_dma_free(struct bgmac int i; for (i = 0; i < BGMAC_MAX_TX_RINGS; i++) @@ -80,7 +80,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> } static int bgmac_dma_alloc(struct bgmac *bgmac) -@@ -603,11 +606,10 @@ static int bgmac_dma_alloc(struct bgmac +@@ -599,11 +602,10 @@ static int bgmac_dma_alloc(struct bgmac for (i = 0; i < BGMAC_MAX_TX_RINGS; i++) { ring = &bgmac->tx_ring[i]; @@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> ring->cpu_base = dma_zalloc_coherent(dma_dev, size, &ring->dma_base, GFP_KERNEL); -@@ -629,11 +631,10 @@ static int bgmac_dma_alloc(struct bgmac +@@ -625,11 +627,10 @@ static int bgmac_dma_alloc(struct bgmac for (i = 0; i < BGMAC_MAX_RX_RINGS; i++) { ring = &bgmac->rx_ring[i]; @@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> ring->cpu_base = dma_zalloc_coherent(dma_dev, size, &ring->dma_base, GFP_KERNEL); -@@ -696,7 +697,7 @@ static int bgmac_dma_init(struct bgmac * +@@ -692,7 +693,7 @@ static int bgmac_dma_init(struct bgmac * ring->start = 0; ring->end = 0; |