Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bf6a0579f60ae5225280c82cc52b51db1255e7fb

Authored by Juuso Oikarinen
Committed by John W. Linville
1 parent 73b30dfe4f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

cfg80211: Fix power save state after interface type change 

Currently cfg80211 only configures the PSM state to the driver upon creation
of a new virtual interface, but not after interface type change. The mac80211
on the other hand reinitializes its sdata structure every time the interface
type is changed, losing the PSM configuration.

Hence, if the interface type is changed to, say, ad-hoc and then back to
managed, "iw wlan0 get power_save" will claim that PSM is enabled, when in
fact on mac80211 level it is not.

Fix this in cfg80211 by configuring the PSM state to the driver each time
the interface is brought up instead of just when the interface is created.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 13 additions and 7 deletions Side-by-side Diff

... ... @@ -718,13 +718,6 @@
718 718 wdev->ps = false;
719 719 /* allow mac80211 to determine the timeout */
720 720 wdev->ps_timeout = -1;
721   - if (rdev->ops->set_power_mgmt)
722   - if (rdev->ops->set_power_mgmt(wdev->wiphy, dev,
723   - wdev->ps,
724   - wdev->ps_timeout)) {
725   - /* assume this means it's off */
726   - wdev->ps = false;
727   - }
728 721  
729 722 if (!dev->ethtool_ops)
730 723 dev->ethtool_ops = &cfg80211_ethtool_ops;
... ... @@ -813,6 +806,19 @@
813 806 rdev->opencount++;
814 807 mutex_unlock(&rdev->devlist_mtx);
815 808 cfg80211_unlock_rdev(rdev);
  809 +
  810 + /*
  811 + * Configure power management to the driver here so that its
  812 + * correctly set also after interface type changes etc.
  813 + */
  814 + if (wdev->iftype == NL80211_IFTYPE_STATION &&
  815 + rdev->ops->set_power_mgmt)
  816 + if (rdev->ops->set_power_mgmt(wdev->wiphy, dev,
  817 + wdev->ps,
  818 + wdev->ps_timeout)) {
  819 + /* assume this means it's off */
  820 + wdev->ps = false;
  821 + }
816 822 break;
817 823 case NETDEV_UNREGISTER:
818 824 /*