Commit 339afbf4 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: support P2P GO powersave configuration 



If the low-level driver wants to support P2P GO
powersave configuration, it must set the cfg80211
flags and mac80211 will pass the parameters to it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 53cabad7

net/mac80211/cfg.c

+15 −1
Original line number Original line Diff line number Diff line
@@ -893,7 +893,8 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	u32 changed = BSS_CHANGED_BEACON_INT |

	u32 changed = BSS_CHANGED_BEACON_INT |

		      BSS_CHANGED_BEACON_ENABLED |

		      BSS_CHANGED_BEACON_ENABLED |

		      BSS_CHANGED_BEACON |

		      BSS_CHANGED_BEACON |

		      BSS_CHANGED_SSID;

		      BSS_CHANGED_SSID |

		      BSS_CHANGED_P2P_PS;

	int err;

	int err;





	old = rtnl_dereference(sdata->u.ap.beacon);

	old = rtnl_dereference(sdata->u.ap.beacon);
@@ -932,6 +933,9 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
	sdata->vif.bss_conf.hidden_ssid =

	sdata->vif.bss_conf.hidden_ssid =

		(params->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE);

		(params->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE);





	sdata->vif.bss_conf.p2p_ctwindow = params->p2p_ctwindow;

	sdata->vif.bss_conf.p2p_oppps = params->p2p_opp_ps;



	err = ieee80211_assign_beacon(sdata, &params->beacon);

	err = ieee80211_assign_beacon(sdata, &params->beacon);

	if (err < 0)

	if (err < 0)

		return err;

		return err;
@@ -1807,6 +1811,16 @@ static int ieee80211_change_bss(struct wiphy *wiphy, 
		changed |= BSS_CHANGED_HT;

		changed |= BSS_CHANGED_HT;

	}

	}





	if (params->p2p_ctwindow >= 0) {

		sdata->vif.bss_conf.p2p_ctwindow = params->p2p_ctwindow;

		changed |= BSS_CHANGED_P2P_PS;

	}



	if (params->p2p_opp_ps >= 0) {

		sdata->vif.bss_conf.p2p_oppps = params->p2p_opp_ps;

		changed |= BSS_CHANGED_P2P_PS;

	}



	ieee80211_bss_info_change_notify(sdata, changed);

	ieee80211_bss_info_change_notify(sdata, changed);





	return 0;

	return 0;

net/mac80211/util.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1527,7 +1527,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
			changed |= BSS_CHANGED_IBSS;

			changed |= BSS_CHANGED_IBSS;

			/* fall through */

			/* fall through */

		case NL80211_IFTYPE_AP:

		case NL80211_IFTYPE_AP:

			changed |= BSS_CHANGED_SSID;

			changed |= BSS_CHANGED_SSID | BSS_CHANGED_P2P_PS;





			if (sdata->vif.type == NL80211_IFTYPE_AP) {

			if (sdata->vif.type == NL80211_IFTYPE_AP) {

				changed |= BSS_CHANGED_AP_PROBE_RESP;

				changed |= BSS_CHANGED_AP_PROBE_RESP;