kernel: Update kernel 4.9 to 4.9.70

[openwrt/openwrt.git] / target / linux / sunxi / patches-4.9 / 0053-stmmac-form-4-13.patch

diff --git a/target/linux/sunxi/patches-4.9/0053-stmmac-form-4-13.patch b/target/linux/sunxi/patches-4.9/0053-stmmac-form-4-13.patch
index f829b79dc3639a430b034b3ab17bb1c7efe237f0..161e9f0e6c2e16ab889f56be826476927780c7bc 100644 (file)
--- a/target/linux/sunxi/patches-4.9/0053-stmmac-form-4-13.patch
+++ b/target/linux/sunxi/patches-4.9/0053-stmmac-form-4-13.patch
@@ -1491,7 +1491,7 @@
        free_dma_tx_desc_resources(priv);
  
        return ret;
-@@ -2895,8 +2893,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
+@@ -2896,8 +2894,7 @@ static netdev_tx_t stmmac_tso_xmit(struc
                priv->xstats.tx_set_ic_bit++;
        }
  
@@ -1501,7 +1501,7 @@
  
        if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
                     priv->hwts_tx_en)) {
-@@ -2974,7 +2971,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -2975,7 +2972,7 @@ static netdev_tx_t stmmac_xmit(struct sk
  
        /* Manage oversized TCP frames for GMAC4 device */
        if (skb_is_gso(skb) && priv->tso) {
@@ -1510,7 +1510,7 @@
                        return stmmac_tso_xmit(skb, dev);
        }
  
-@@ -3105,8 +3102,7 @@ static netdev_tx_t stmmac_xmit(struct sk
+@@ -3106,8 +3103,7 @@ static netdev_tx_t stmmac_xmit(struct sk
                priv->xstats.tx_set_ic_bit++;
        }
  
@@ -1520,7 +1520,7 @@
  
        /* Ready to fill the first descriptor and set the OWN bit w/o any
         * problems because all the descriptors are actually ready to be
-@@ -3983,7 +3979,9 @@ static int stmmac_hw_init(struct stmmac_
+@@ -3984,7 +3980,9 @@ static int stmmac_hw_init(struct stmmac_
        struct mac_device_info *mac;
  
        /* Identify the MAC HW device */
@@ -1531,7 +1531,7 @@
                priv->dev->priv_flags |= IFF_UNICAST_FLT;
                mac = dwmac1000_setup(priv->ioaddr,
                                      priv->plat->multicast_filter_bins,
-@@ -4003,6 +4001,10 @@ static int stmmac_hw_init(struct stmmac_
+@@ -4004,6 +4002,10 @@ static int stmmac_hw_init(struct stmmac_
  
        priv->hw = mac;
  
@@ -1542,7 +1542,7 @@
        /* To use the chained or ring mode */
        if (priv->synopsys_id >= DWMAC_CORE_4_00) {
                priv->hw->mode = &dwmac4_ring_mode_ops;
-@@ -4131,8 +4133,15 @@ int stmmac_dvr_probe(struct device *devi
+@@ -4132,8 +4134,15 @@ int stmmac_dvr_probe(struct device *devi
        if ((phyaddr >= 0) && (phyaddr <= 31))
                priv->plat->phy_addr = phyaddr;
  
@@ -1559,7 +1559,7 @@
  
        /* Init MAC and get the capabilities */
        ret = stmmac_hw_init(priv);
-@@ -4149,7 +4158,7 @@ int stmmac_dvr_probe(struct device *devi
+@@ -4150,7 +4159,7 @@ int stmmac_dvr_probe(struct device *devi
                            NETIF_F_RXCSUM;
  
        if ((priv->plat->tso_en) && (priv->dma_cap.tsoen)) {
@@ -1568,7 +1568,7 @@
                priv->tso = true;
                dev_info(priv->device, "TSO feature enabled\n");
        }
-@@ -4311,7 +4320,7 @@ int stmmac_suspend(struct device *dev)
+@@ -4312,7 +4321,7 @@ int stmmac_suspend(struct device *dev)
        }
        spin_unlock_irqrestore(&priv->lock, flags);