projects
/
openwrt
/
staging
/
dedeckeh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update kernel 4.4 to version 4.4.79
[openwrt/staging/dedeckeh.git]
/
target
/
linux
/
generic
/
patches-4.4
/
070-v4.8-0003-bgmac-Maintain-some-netdev-statistics.patch
diff --git
a/target/linux/generic/patches-4.4/070-v4.8-0003-bgmac-Maintain-some-netdev-statistics.patch
b/target/linux/generic/patches-4.4/070-v4.8-0003-bgmac-Maintain-some-netdev-statistics.patch
index 322851d026d5a01e79e2e6a96e6875f313845013..1dbe1743dff994f881ce3ad81fdda4fc7448130e 100644
(file)
--- a/
target/linux/generic/patches-4.4/070-v4.8-0003-bgmac-Maintain-some-netdev-statistics.patch
+++ b/
target/linux/generic/patches-4.4/070-v4.8-0003-bgmac-Maintain-some-netdev-statistics.patch
@@
-23,7
+23,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
return NETDEV_TX_OK;
}
return NETDEV_TX_OK;
}
-@@ -28
4,6 +286
,8 @@ static void bgmac_dma_tx_free(struct bgm
+@@ -28
5,6 +287
,8 @@ static void bgmac_dma_tx_free(struct bgm
DMA_TO_DEVICE);
if (slot->skb) {
DMA_TO_DEVICE);
if (slot->skb) {
@@
-32,7
+32,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
bytes_compl += slot->skb->len;
pkts_compl++;
bytes_compl += slot->skb->len;
pkts_compl++;
-@@ -46
7,6 +471
,7 @@ static int bgmac_dma_rx_read(struct bgma
+@@ -46
8,6 +472
,7 @@ static int bgmac_dma_rx_read(struct bgma
bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
ring->start);
put_page(virt_to_head_page(buf));
bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
ring->start);
put_page(virt_to_head_page(buf));
@@
-40,7
+40,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
break;
}
break;
}
-@@ -47
4,6 +479
,8 @@ static int bgmac_dma_rx_read(struct bgma
+@@ -47
5,6 +480
,8 @@ static int bgmac_dma_rx_read(struct bgma
bgmac_err(bgmac, "Found oversized packet at slot %d, DMA issue!\n",
ring->start);
put_page(virt_to_head_page(buf));
bgmac_err(bgmac, "Found oversized packet at slot %d, DMA issue!\n",
ring->start);
put_page(virt_to_head_page(buf));
@@
-49,7
+49,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
break;
}
break;
}
-@@ -48
4,6 +491
,7 @@ static int bgmac_dma_rx_read(struct bgma
+@@ -48
5,6 +492
,7 @@ static int bgmac_dma_rx_read(struct bgma
if (unlikely(!skb)) {
bgmac_err(bgmac, "build_skb failed\n");
put_page(virt_to_head_page(buf));
if (unlikely(!skb)) {
bgmac_err(bgmac, "build_skb failed\n");
put_page(virt_to_head_page(buf));
@@
-57,7
+57,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
break;
}
skb_put(skb, BGMAC_RX_FRAME_OFFSET +
break;
}
skb_put(skb, BGMAC_RX_FRAME_OFFSET +
-@@ -49
3,6 +501
,8 @@ static int bgmac_dma_rx_read(struct bgma
+@@ -49
4,6 +502
,8 @@ static int bgmac_dma_rx_read(struct bgma
skb_checksum_none_assert(skb);
skb->protocol = eth_type_trans(skb, bgmac->net_dev);
skb_checksum_none_assert(skb);
skb->protocol = eth_type_trans(skb, bgmac->net_dev);