merged. Bruce
In message: [linux-yocto][v5.10/standard/x86&v5.10/standard/preempt-rt/x86][PATCH 1/2] Revert: "net: stmmac: enable wakeup capability only when Network Proxy Agent is ready" on 09/11/2022 Li Wang wrote: > This reverts commit 5391643bb6f17db8dbf916dc1c21773601236a77 from > https://github.com/intel/linux-intel-lts.git > > drivers/net/ethernet/stmicro/stmmac/stmmac_netproxy.c > error: 'struct np_netdev' has no member named 'proxy_wakeup_enable' > > Signed-off-by: Li Wang <li.w...@windriver.com> > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + > .../net/ethernet/stmicro/stmmac/stmmac_netproxy.c | 14 -------------- > 2 files changed, 1 insertion(+), 14 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index fd777412b162..1feb49d24216 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -6972,6 +6972,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv) > if (priv->plat->pmt) { > dev_info(priv->device, "Wake-Up On Lan supported\n"); > device_set_wakeup_capable(priv->device, 1); > + device_set_wakeup_enable(priv->device, 1); > } > > if (priv->dma_cap.tsoen) > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_netproxy.c > b/drivers/net/ethernet/stmicro/stmmac/stmmac_netproxy.c > index abcb5cfb1fbf..51fa3d26c0c0 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_netproxy.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_netproxy.c > @@ -202,19 +202,6 @@ static int stmmac_netprox_resume(struct stmmac_priv > *priv, > return 0; > } > > -/** > - * stmmac_netproxy_wakeup_enable - stmmac network proxy wakeup enable > function > - * @ndev: net device structure > - * @enable: 1: enable; 0: disable > - * Description: Enable/disable Network Proxy to wake up system > - */ > -static void stmmac_netproxy_wakeup_enable(struct net_device *ndev, bool > enable) > -{ > - struct stmmac_priv *priv = netdev_priv(ndev); > - > - device_set_wakeup_enable(priv->device, enable); > -} > - > /** > * stmmac_netproxy_register - register to network proxy framework > * @ndev: net device structure > @@ -234,7 +221,6 @@ int stmmac_netproxy_register(struct net_device *ndev) > INIT_WORK(&priv->netprox_task, netprox_resume_task); > > np_netdev.netdev = ndev; > - np_netdev.proxy_wakeup_enable = &stmmac_netproxy_wakeup_enable; > > /* TODO: check registration is success */ > netprox_register_netdev(&np_netdev, NULL, 0); > -- > 2.35.1 > In message: [linux-yocto][v5.10/standard/x86&v5.10/standard/preempt-rt/x86][PATCH 2/2] stmmac_netproxy.c: make STMMAC_NETWORK_PROXY as module on 09/11/2022 Li Wang wrote: > if NETWORK_PROXY is module, STMMAC_NETWORK_PROXY shuold be a module. > otherwise compile error. > > Signed-off-by: Li Wang <li.w...@windriver.com> > --- > drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig > b/drivers/net/ethernet/stmicro/stmmac/Kconfig > index 6a446c66f555..656237273f96 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig > +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig > @@ -254,7 +254,7 @@ config STMMAC_PCI > If unsure, say N. > > config STMMAC_NETWORK_PROXY > - bool "STMMAC Network Proxy support" > + tristate "STMMAC Network Proxy support" > depends on STMMAC_ETH && STMMAC_PCI && NETWORK_PROXY > help > This selects the Network Proxy support for the stmmac driver. > -- > 2.35.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11870): https://lists.yoctoproject.org/g/linux-yocto/message/11870 Mute This Topic: https://lists.yoctoproject.org/mt/94942744/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
