Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1205f543 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

carl9170: allow PSM if the 5 GHz band is selected 



Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f3716fd7

drivers/net/wireless/ath/carl9170/carl9170.h

+0 −1
Original line number Diff line number Diff line
@@ -442,7 +442,6 @@ struct ar9170 { 
enum carl9170_ps_off_override_reasons {

	PS_OFF_VIF	= BIT(0),

	PS_OFF_BCN	= BIT(1),

	PS_OFF_5GHZ	= BIT(2),

};



struct carl9170_ba_stats {

drivers/net/wireless/ath/carl9170/fw.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len) 
		ar->disable_offload = true;

	}



	if (SUPP(CARL9170FW_PSM))

	if (SUPP(CARL9170FW_PSM) && SUPP(CARL9170FW_FIXED_5GHZ_PSM))

		ar->hw->flags |= IEEE80211_HW_SUPPORTS_PS;



	if (!SUPP(CARL9170FW_USB_INIT_FIRMWARE)) {

drivers/net/wireless/ath/carl9170/phy.c

+0 −6
Original line number Diff line number Diff line
@@ -1783,12 +1783,6 @@ int carl9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel, 
		}

	}



	/* FIXME: PSM does not work in 5GHz Band */

	if (channel->band == IEEE80211_BAND_5GHZ)

		ar->ps.off_override |= PS_OFF_5GHZ;

	else

		ar->ps.off_override &= ~PS_OFF_5GHZ;



	ar->channel = channel;

	ar->ht_settings = new_ht;

	return 0;