diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-12-08 04:47:58 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-12-08 04:53:17 +0300 |
| commit | 2483e7f04ce0e97c69b27d28ebce7a2320b7a7a6 (patch) | |
| tree | a45d2e6897a32eaee4b6a5b3b84617d5ca52f4b2 /drivers/pmdomain/qcom/rpmpd.c | |
| parent | 87e839c82cc36346a2cd183ca941316902110716 (diff) | |
| parent | 5e3f5b81de80c98338bcb47c233aebefee5a4801 (diff) | |
| download | linux-2483e7f04ce0e97c69b27d28ebce7a2320b7a7a6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Conflicts:
drivers/net/ethernet/stmicro/stmmac/dwmac5.c
drivers/net/ethernet/stmicro/stmmac/dwmac5.h
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
drivers/net/ethernet/stmicro/stmmac/hwif.h
37e4b8df27bc ("net: stmmac: fix FPE events losing")
c3f3b97238f6 ("net: stmmac: Refactor EST implementation")
https://lore.kernel.org/all/20231206110306.01e91114@canb.auug.org.au/
Adjacent changes:
net/ipv4/tcp_ao.c
9396c4ee93f9 ("net/tcp: Don't store TCP-AO maclen on reqsk")
7b0f570f879a ("tcp: Move TCP-AO bits from cookie_v[46]_check() to tcp_ao_syncookie().")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/pmdomain/qcom/rpmpd.c')
| -rw-r--r-- | drivers/pmdomain/qcom/rpmpd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pmdomain/qcom/rpmpd.c b/drivers/pmdomain/qcom/rpmpd.c index 07590a3ef19c..7796d65f96e8 100644 --- a/drivers/pmdomain/qcom/rpmpd.c +++ b/drivers/pmdomain/qcom/rpmpd.c @@ -1044,6 +1044,7 @@ static int rpmpd_probe(struct platform_device *pdev) rpmpds[i]->pd.power_off = rpmpd_power_off; rpmpds[i]->pd.power_on = rpmpd_power_on; rpmpds[i]->pd.set_performance_state = rpmpd_set_performance; + rpmpds[i]->pd.flags = GENPD_FLAG_ACTIVE_WAKEUP; pm_genpd_init(&rpmpds[i]->pd, NULL, true); data->domains[i] = &rpmpds[i]->pd; |