diff --git a/[refs] b/[refs]
index f082ce7509ff..68fde291bbbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2abb6e2bcb91ae384c5857dffd0bb97b76c7a68
+refs/heads/master: 5966f2ddcda452455f8ab518b7cba221b5234a94
diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c
index 112959d5256a..645437cfc464 100644
--- a/trunk/net/wireless/core.c
+++ b/trunk/net/wireless/core.c
@@ -922,7 +922,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
 		 * Configure power management to the driver here so that its
 		 * correctly set also after interface type changes etc.
 		 */
-		if (wdev->iftype == NL80211_IFTYPE_STATION &&
+		if ((wdev->iftype == NL80211_IFTYPE_STATION ||
+		     wdev->iftype == NL80211_IFTYPE_P2P_CLIENT) &&
 		    rdev->ops->set_power_mgmt)
 			if (rdev->ops->set_power_mgmt(wdev->wiphy, dev,
 						      wdev->ps,