diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-04-19 11:38:46 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-04-19 11:38:46 +0000 |
| commit | 025b5cf8bdea775b87a19b80c3a4c8e3b19beec9 (patch) | |
| tree | a4ceeb440e0607a889a5403d4cff15b9664dbd56 /target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch | |
| parent | 1da88fdb3e0344c56d40f7ad69ca153a289d9a27 (diff) | |
| download | master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.tar.gz master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.tar.bz2 master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.zip | |
kernel: refresh generic patches
Refresh patches to remove the trailing whitespaces caused by an old
diffutils version on osx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45506 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch b/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch index ed03db069e..f8d7921159 100644 --- a/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch +++ b/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> } static int bgmac_dma_alloc(struct bgmac *bgmac) -@@ -621,8 +629,6 @@ static int bgmac_dma_alloc(struct bgmac +@@ -621,8 +629,6 @@ static int bgmac_dma_alloc(struct bgmac } for (i = 0; i < BGMAC_MAX_RX_RINGS; i++) { @@ -53,7 +53,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> ring = &bgmac->rx_ring[i]; ring->num_slots = BGMAC_RX_RING_SLOTS; ring->mmio_base = ring_base[i]; -@@ -645,15 +651,6 @@ static int bgmac_dma_alloc(struct bgmac +@@ -645,15 +651,6 @@ static int bgmac_dma_alloc(struct bgmac ring->index_base = lower_32_bits(ring->dma_base); else ring->index_base = 0; @@ -82,7 +82,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> for (i = 0; i < BGMAC_MAX_TX_RINGS; i++) { ring = &bgmac->tx_ring[i]; -@@ -698,8 +695,13 @@ static void bgmac_dma_init(struct bgmac +@@ -698,8 +695,13 @@ static void bgmac_dma_init(struct bgmac if (ring->unaligned) bgmac_dma_rx_enable(bgmac, ring); @@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> bgmac_write(bgmac, ring->mmio_base + BGMAC_DMA_RX_INDEX, ring->index_base + -@@ -708,6 +710,12 @@ static void bgmac_dma_init(struct bgmac +@@ -708,6 +710,12 @@ static void bgmac_dma_init(struct bgmac ring->start = 0; ring->end = 0; } @@ -141,7 +141,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> bgmac_enable(bgmac); } -@@ -1274,23 +1270,27 @@ static int bgmac_open(struct net_device +@@ -1274,23 +1270,27 @@ static int bgmac_open(struct net_device int err = 0; bgmac_chip_reset(bgmac); @@ -174,7 +174,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> } static int bgmac_stop(struct net_device *net_dev) -@@ -1306,6 +1306,7 @@ static int bgmac_stop(struct net_device +@@ -1306,6 +1306,7 @@ static int bgmac_stop(struct net_device free_irq(bgmac->core->irq, net_dev); bgmac_chip_reset(bgmac); |