kernel: bump 5.4 to 5.4.24

[openwrt/staging/wigyori.git] / target / linux / ipq806x / patches-5.4 / 701-stmmac-fix-notifier-registration.patch

diff --git a/target/linux/ipq806x/patches-5.4/701-stmmac-fix-notifier-registration.patch b/target/linux/ipq806x/patches-5.4/701-stmmac-fix-notifier-registration.patch
index 187cbacde0d222effdb0550997710bc67f247937..2c25ad33e8da904cf3931d07e57ebb1fa98ffdc4 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/701-stmmac-fix-notifier-registration.patch
+++ b/target/linux/ipq806x/patches-5.4/701-stmmac-fix-notifier-registration.patch
@@ -16,11 +16,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 (limited to 'drivers/net/ethernet/stmicro/stmmac')
 
-diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index 5836b21edd7e..7da18c9afa01 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -4405,6 +4405,8 @@ static void stmmac_init_fs(struct net_device *dev)
+@@ -4208,6 +4208,8 @@ static void stmmac_init_fs(struct net_de
  {
        struct stmmac_priv *priv = netdev_priv(dev);
  
@@ -29,7 +27,7 @@ index 5836b21edd7e..7da18c9afa01 100644
        /* Create per netdev entries */
        priv->dbgfs_dir = debugfs_create_dir(dev->name, stmmac_fs_dir);
  
-@@ -4416,14 +4418,13 @@ static void stmmac_init_fs(struct net_device *dev)
+@@ -4219,14 +4221,13 @@ static void stmmac_init_fs(struct net_de
        debugfs_create_file("dma_cap", 0444, priv->dbgfs_dir, dev,
                            &stmmac_dma_cap_fops);
  
@@ -45,7 +43,7 @@ index 5836b21edd7e..7da18c9afa01 100644
        debugfs_remove_recursive(priv->dbgfs_dir);
  }
  #endif /* CONFIG_DEBUG_FS */
-@@ -4940,14 +4941,14 @@ int stmmac_dvr_remove(struct device *dev)
+@@ -4728,14 +4729,14 @@ int stmmac_dvr_remove(struct device *dev
  
        netdev_info(priv->dev, "%s: removing driver", __func__);
  
@@ -63,7 +61,7 @@ index 5836b21edd7e..7da18c9afa01 100644
        phylink_destroy(priv->phylink);
        if (priv->plat->stmmac_rst)
                reset_control_assert(priv->plat->stmmac_rst);
-@@ -5166,6 +5167,7 @@ static int __init stmmac_init(void)
+@@ -4955,6 +4956,7 @@ static int __init stmmac_init(void)
        /* Create debugfs main directory if it doesn't exist yet */
        if (!stmmac_fs_dir)
                stmmac_fs_dir = debugfs_create_dir(STMMAC_RESOURCE_NAME, NULL);
@@ -71,7 +69,7 @@ index 5836b21edd7e..7da18c9afa01 100644
  #endif
  
        return 0;
-@@ -5174,6 +5176,7 @@ static int __init stmmac_init(void)
+@@ -4963,6 +4965,7 @@ static int __init stmmac_init(void)
  static void __exit stmmac_exit(void)
  {
  #ifdef CONFIG_DEBUG_FS
@@ -79,6 +77,3 @@ index 5836b21edd7e..7da18c9afa01 100644
        debugfs_remove_recursive(stmmac_fs_dir);
  #endif
  }
--- 
-cgit 1.2-0.3.lf.el7
-