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

Commit 317ed42b authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: move tx protection routines in mt76x02-lib module 



Move mt76x02_set_rts_threshold and mt76x02_mac_set_tx_protection
routines in mt76x02-lib module and remove duplicated code in mt76x0
and mt76x2 drivers. Remove pci_mac.c and mt76x0/mac.c since now are
empty files

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 13ed9d4a

drivers/net/wireless/mediatek/mt76/mt76x0/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ obj-$(CONFIG_MT76x0U) += mt76x0u.o 
obj-$(CONFIG_MT76x0E) += mt76x0e.o

obj-$(CONFIG_MT76x0_COMMON) += mt76x0-common.o



mt76x0-common-y := \

	init.o main.o eeprom.o phy.o mac.o

mt76x0-common-y := init.o main.o eeprom.o phy.o



mt76x0u-y := usb.o usb_mcu.o

mt76x0e-y := pci.o pci_mcu.o

drivers/net/wireless/mediatek/mt76/mt76x0/mac.c

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>

 * Copyright (C) 2015 Jakub Kicinski <kubakici@wp.pl>

 * Copyright (C) 2018 Stanislaw Gruszka <stf_xl@wp.pl>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2

 * as published by the Free Software Foundation

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/etherdevice.h>



#include "mt76x0.h"



void mt76x0_mac_set_protection(struct mt76x02_dev *dev, bool legacy_prot,

			       int ht_mode)

{

	int mode = ht_mode & IEEE80211_HT_OP_MODE_PROTECTION;

	bool non_gf = !!(ht_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);

	u32 prot[6];

	bool ht_rts[4] = {};

	int i;



	prot[0] = MT_PROT_NAV_SHORT |

		  MT_PROT_TXOP_ALLOW_ALL |

		  MT_PROT_RTS_THR_EN;

	prot[1] = prot[0];

	if (legacy_prot)

		prot[1] |= MT_PROT_CTRL_CTS2SELF;



	prot[2] = prot[4] = MT_PROT_NAV_SHORT | MT_PROT_TXOP_ALLOW_BW20;

	prot[3] = prot[5] = MT_PROT_NAV_SHORT | MT_PROT_TXOP_ALLOW_ALL;



	if (legacy_prot) {

		prot[2] |= MT_PROT_RATE_CCK_11;

		prot[3] |= MT_PROT_RATE_CCK_11;

		prot[4] |= MT_PROT_RATE_CCK_11;

		prot[5] |= MT_PROT_RATE_CCK_11;

	} else {

		prot[2] |= MT_PROT_RATE_OFDM_24;

		prot[3] |= MT_PROT_RATE_DUP_OFDM_24;

		prot[4] |= MT_PROT_RATE_OFDM_24;

		prot[5] |= MT_PROT_RATE_DUP_OFDM_24;

	}



	switch (mode) {

	case IEEE80211_HT_OP_MODE_PROTECTION_NONE:

		break;



	case IEEE80211_HT_OP_MODE_PROTECTION_NONMEMBER:

		ht_rts[0] = ht_rts[1] = ht_rts[2] = ht_rts[3] = true;

		break;



	case IEEE80211_HT_OP_MODE_PROTECTION_20MHZ:

		ht_rts[1] = ht_rts[3] = true;

		break;



	case IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED:

		ht_rts[0] = ht_rts[1] = ht_rts[2] = ht_rts[3] = true;

		break;

	}



	if (non_gf)

		ht_rts[2] = ht_rts[3] = true;



	for (i = 0; i < 4; i++)

		if (ht_rts[i])

			prot[i + 2] |= MT_PROT_CTRL_RTS_CTS;



	for (i = 0; i < 6; i++)

		mt76_wr(dev, MT_CCK_PROT_CFG + i * 4, prot[i]);

}

drivers/net/wireless/mediatek/mt76/mt76x0/main.c

+0 −14
Original line number Diff line number Diff line
@@ -107,10 +107,6 @@ void mt76x0_bss_info_changed(struct ieee80211_hw *hw, 
		dev->tbtt_count = 0;

	}



	if (changed & BSS_CHANGED_HT || changed & BSS_CHANGED_ERP_CTS_PROT)

		mt76x0_mac_set_protection(dev, info->use_cts_prot,

					   info->ht_operation_mode);



	if (changed & BSS_CHANGED_ERP_PREAMBLE)

		mt76x02_mac_set_short_preamble(dev, info->use_short_preamble);
@@ -124,13 +120,3 @@ void mt76x0_bss_info_changed(struct ieee80211_hw *hw, 
	mutex_unlock(&dev->mt76.mutex);

}

EXPORT_SYMBOL_GPL(mt76x0_bss_info_changed);
 


int mt76x0_set_rts_threshold(struct ieee80211_hw *hw, u32 value)

{

	struct mt76x02_dev *dev = hw->priv;



	mt76_rmw_field(dev, MT_TX_RTS_CFG, MT_TX_RTS_CFG_THRESH, value);



	return 0;

}

EXPORT_SYMBOL_GPL(mt76x0_set_rts_threshold);

drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h

+0 −5
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed); 
void mt76x0_bss_info_changed(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif,

			     struct ieee80211_bss_conf *info, u32 changed);

int mt76x0_set_rts_threshold(struct ieee80211_hw *hw, u32 value);



/* PHY */

void mt76x0_phy_init(struct mt76x02_dev *dev);
@@ -74,8 +73,4 @@ int mt76x0_phy_set_channel(struct mt76x02_dev *dev, 
			    struct cfg80211_chan_def *chandef);

void mt76x0_phy_set_txpower(struct mt76x02_dev *dev);

void mt76x0_phy_calibrate(struct mt76x02_dev *dev, bool power_on);



/* MAC */

void mt76x0_mac_set_protection(struct mt76x02_dev *dev, bool legacy_prot,

				int ht_mode);

#endif

drivers/net/wireless/mediatek/mt76/mt76x0/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ static const struct ieee80211_ops mt76x0e_ops = { 
	.set_tim = mt76x0e_set_tim,

	.release_buffered_frames = mt76_release_buffered_frames,

	.set_coverage_class = mt76x02_set_coverage_class,

	.set_rts_threshold = mt76x02_set_rts_threshold,

};



static int mt76x0e_register_device(struct mt76x02_dev *dev)