Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (649bf178) · Commits · e / devices / android_kernel_xiaomi_sm6125

drivers/net/wireless/rtl818x/rtl8187_dev.c

+10 −4

Original line number	Diff line number	Diff line
		@@ -869,6 +869,9 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev)
		priv->aifsn[3] = 3; /* AIFSN[AC_BE] */
		rtl818x_iowrite8(priv, &priv->map->ACM_CONTROL, 0);

		/* ENEDCA flag must always be set, transmit issues? */
		rtl818x_iowrite8(priv, &priv->map->MSR, RTL818X_MSR_ENEDCA);

		return 0;
		}

		@@ -1173,13 +1176,16 @@ static void rtl8187_bss_info_changed(struct ieee80211_hw *dev,
		rtl818x_iowrite8(priv, &priv->map->BSSID[i],
		info->bssid[i]);

		if (is_valid_ether_addr(info->bssid)) {
		reg = RTL818X_MSR_INFRA;
		if (priv->is_rtl8187b)
		reg \|= RTL818X_MSR_ENEDCA;
		reg = RTL818X_MSR_ENEDCA;
		else
		reg = 0;

		if (is_valid_ether_addr(info->bssid)) {
		reg \|= RTL818X_MSR_INFRA;
		rtl818x_iowrite8(priv, &priv->map->MSR, reg);
		} else {
		reg = RTL818X_MSR_NO_LINK;
		reg \|= RTL818X_MSR_NO_LINK;
		rtl818x_iowrite8(priv, &priv->map->MSR, reg);
		}