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

Commit 355668d2 authored by Andrea Merello's avatar Andrea Merello Committed by John W. Linville
Browse files

rtl8180: add ERP configuration for rtl8187se 



This patch adds ERP configuration support for rtl8187se to the
existing ERP configuration function.
It needs a different register offset and it must not apply
rtl8185 workaround.

Signed-off-by: default avatarAndrea Merello <andrea.merello@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4a67aa5d

drivers/net/wireless/rtl818x/rtl8180/dev.c

+10 −6
Original line number Diff line number Diff line
@@ -1336,6 +1336,9 @@ static void rtl8180_conf_erp(struct ieee80211_hw *dev, 
	/* from reference code. set ack timeout reg = eifs reg */

	rtl818x_iowrite8(priv, &priv->map->CARRIER_SENSE_COUNTER, hw_eifs);



	if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8187SE)

		rtl818x_iowrite8(priv, &priv->map->EIFS_8187SE, hw_eifs);

	else if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8185) {

		/* rtl8187/rtl8185 HW bug. After EIFS is elapsed,

		 * the HW still wait for DIFS.

		 * HW uses 4uS units for EIFS.
@@ -1344,6 +1347,7 @@ static void rtl8180_conf_erp(struct ieee80211_hw *dev, 


		rtl818x_iowrite8(priv, &priv->map->EIFS, hw_eifs);

	}

}



static void rtl8180_bss_info_changed(struct ieee80211_hw *dev,

				     struct ieee80211_vif *vif,