diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-05-07 09:29:27 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
| commit | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (patch) | |
| tree | b0863145b745e4b5dda3e2f86bcb8f14461b16e9 /target/linux/mediatek/patches-5.4/0999-hnat.patch | |
| parent | 4f6343ffe7fe8f7018f904b153dea9fc6038daf4 (diff) | |
| download | upstream-d1d2c0b5579ea4f69a42246c9318539d61ba1999.tar.gz upstream-d1d2c0b5579ea4f69a42246c9318539d61ba1999.tar.bz2 upstream-d1d2c0b5579ea4f69a42246c9318539d61ba1999.zip | |
kernel: bump 5.4 to 5.4.39
Refreshed patches.
Run tested: qemu-x86-64
Build tested: x86/64, imx6, sunxi/a53, layerscape/armv7+armv8_64b
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/mediatek/patches-5.4/0999-hnat.patch')
| -rw-r--r-- | target/linux/mediatek/patches-5.4/0999-hnat.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/mediatek/patches-5.4/0999-hnat.patch b/target/linux/mediatek/patches-5.4/0999-hnat.patch index 66c29cf1c0..f0af321fd8 100644 --- a/target/linux/mediatek/patches-5.4/0999-hnat.patch +++ b/target/linux/mediatek/patches-5.4/0999-hnat.patch @@ -147,7 +147,7 @@ #include "mtk_eth_soc.h" -@@ -1298,8 +1312,16 @@ static int mtk_poll_rx(struct napi_struc +@@ -1298,8 +1300,16 @@ static int mtk_poll_rx(struct napi_struc (trxd.rxd2 & RX_DMA_VTAG)) __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), RX_DMA_VID(trxd.rxd3)); @@ -166,7 +166,7 @@ ring->data[idx] = new_data; rxd->rxd1 = (unsigned int)dma_addr; -@@ -2216,6 +2238,9 @@ static int mtk_open(struct net_device *d +@@ -2216,6 +2226,9 @@ static int mtk_open(struct net_device *d mtk_tx_irq_enable(eth, MTK_TX_DONE_INT); mtk_rx_irq_enable(eth, MTK_RX_DONE_INT); refcount_set(ð->dma_refcnt, 1); @@ -176,7 +176,7 @@ } else refcount_inc(ð->dma_refcnt); -@@ -2274,6 +2299,9 @@ static int mtk_stop(struct net_device *d +@@ -2274,6 +2287,9 @@ static int mtk_stop(struct net_device *d mtk_dma_free(eth); @@ -186,7 +186,7 @@ return 0; } -@@ -2733,6 +2761,27 @@ static int mtk_set_rxnfc(struct net_devi +@@ -2733,6 +2749,27 @@ static int mtk_set_rxnfc(struct net_devi return ret; } @@ -214,7 +214,7 @@ static const struct ethtool_ops mtk_ethtool_ops = { .get_link_ksettings = mtk_get_link_ksettings, .set_link_ksettings = mtk_set_link_ksettings, -@@ -2764,6 +2813,9 @@ static const struct net_device_ops mtk_n +@@ -2764,6 +2801,9 @@ static const struct net_device_ops mtk_n #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = mtk_poll_controller, #endif @@ -224,7 +224,7 @@ }; static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) -@@ -3097,6 +3149,7 @@ static const struct mtk_soc_data mt7622_ +@@ -3097,6 +3137,7 @@ static const struct mtk_soc_data mt7622_ .hw_features = MTK_HW_FEATURES, .required_clks = MT7622_CLKS_BITMAP, .required_pctl = false, |