mt76: move mt76x02_tx in mt76x02-lib module (2f0308d0) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ obj-$(CONFIG_MT76x0_COMMON) += mt76x0-common.o

		mt76x0-common-y := \
		init.o main.o trace.o eeprom.o phy.o \
		mac.o debugfs.o tx.o
		mac.o debugfs.o
		mt76x0u-y := usb.o usb_mcu.o
		mt76x0e-y := pci.o pci_mcu.o

+0 −4

Original line number	Diff line number	Diff line
		@@ -84,8 +84,4 @@ void mt76x0_mac_set_short_preamble(struct mt76x02_dev *dev, bool short_preamb);
		void mt76x0_mac_config_tsf(struct mt76x02_dev *dev, bool enable, int interval);
		void mt76x0_mac_set_ampdu_factor(struct mt76x02_dev *dev);

		/* TX */
		void mt76x0_tx(struct ieee80211_hw hw, struct ieee80211_tx_control control,
		struct sk_buff *skb);

		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ static void mt76x0e_stop(struct ieee80211_hw *hw)
		}

		static const struct ieee80211_ops mt76x0e_ops = {
		.tx = mt76x0_tx,
		.tx = mt76x02_tx,
		.start = mt76x0e_start,
		.stop = mt76x0e_stop,
		.config = mt76x0_config,

deleted100644 → 0

+0 −47

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>
		* Copyright (C) 2015 Jakub Kicinski <kubakici@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 "mt76x0.h"
		#include "trace.h"
		#include "../mt76x02_util.h"
		#include "../mt76x02_usb.h"

		void mt76x0_tx(struct ieee80211_hw hw, struct ieee80211_tx_control control,
		struct sk_buff *skb)
		{
		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
		struct mt76x02_dev *dev = hw->priv;
		struct ieee80211_vif *vif = info->control.vif;
		struct mt76_wcid *wcid = &dev->mt76.global_wcid;

		if (control->sta) {
		struct mt76x02_sta *msta;

		msta = (struct mt76x02_sta *)control->sta->drv_priv;
		wcid = &msta->wcid;
		/* sw encrypted frames */
		if (!info->control.hw_key && wcid->hw_key_idx != 0xff)
		control->sta = NULL;
		}

		if (vif && !control->sta) {
		struct mt76x02_vif *mvif;

		mvif = (struct mt76x02_vif *)vif->drv_priv;
		wcid = &mvif->group_wcid;
		}

		mt76_tx(&dev->mt76, control->sta, wcid, skb);
		}
		EXPORT_SYMBOL_GPL(mt76x0_tx);

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ static void mt76x0u_stop(struct ieee80211_hw *hw)
		}

		static const struct ieee80211_ops mt76x0u_ops = {
		.tx = mt76x0_tx,
		.tx = mt76x02_tx,
		.start = mt76x0u_start,
		.stop = mt76x0u_stop,
		.add_interface = mt76x02_add_interface,