mt76: unify {insert/remove}_hdr_pad (0e59cba8) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,6 @@ obj-$(CONFIG_MT76x0U) += mt76x0.o

		mt76x0-objs = \
		usb.o init.o main.o mcu.o trace.o dma.o eeprom.o phy.o \
		mac.o util.o debugfs.o tx.o
		mac.o debugfs.o tx.o
		# ccflags-y := -DDEBUG
		CFLAGS_trace.o := -I$(src)

+0 −4

Original line number	Diff line number	Diff line
		@@ -245,10 +245,6 @@ void mt76x0_tx(struct ieee80211_hw hw, struct ieee80211_tx_control control,
		void mt76x0_tx_status(struct mt76x0_dev dev, struct sk_buff skb);
		void mt76x0_tx_stat(struct work_struct *work);

		/* util */
		void mt76x0_remove_hdr_pad(struct sk_buff *skb);
		int mt76x0_insert_hdr_pad(struct sk_buff *skb);

		int mt76x0_dma_init(struct mt76x0_dev *dev);
		void mt76x0_dma_cleanup(struct mt76x0_dev *dev);

+3 −2

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		#include "mt76x0.h"
		#include "trace.h"
		#include "../mt76x02_util.h"

		/* Take mac80211 Q id from the skb and translate it to hardware Q id */
		static u8 skb2q(struct sk_buff *skb)
		@@ -35,7 +36,7 @@ static void mt76x0_tx_skb_remove_dma_overhead(struct sk_buff *skb,

		skb_pull(skb, sizeof(struct mt76x02_txwi) + 4);
		if (ieee80211_get_hdrlen_from_skb(skb) % 4)
		mt76x0_remove_hdr_pad(skb);
		mt76x02_remove_hdr_pad(skb, 2);

		skb_trim(skb, pkt_len);
		}
		@@ -146,7 +147,7 @@ void mt76x0_tx(struct ieee80211_hw hw, struct ieee80211_tx_control control,
		BUILD_BUG_ON(ARRAY_SIZE(info->status.status_driver_data) < 1);
		info->status.status_driver_data[0] = (void *)(unsigned long)pkt_len;

		mt76x0_insert_hdr_pad(skb);
		mt76x02_insert_hdr_pad(skb);

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

deleted100644 → 0

+0 −42

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>
		*
		* 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"

		void mt76x0_remove_hdr_pad(struct sk_buff *skb)
		{
		int len = ieee80211_get_hdrlen_from_skb(skb);

		memmove(skb->data + 2, skb->data, len);
		skb_pull(skb, 2);
		}

		int mt76x0_insert_hdr_pad(struct sk_buff *skb)
		{
		int len = ieee80211_get_hdrlen_from_skb(skb);
		int ret;

		if (len % 4 == 0)
		return 0;

		ret = skb_cow(skb, 2);
		if (ret)
		return ret;

		skb_push(skb, 2);
		memmove(skb->data, skb->data + 2, len);

		skb->data[len] = 0;
		skb->data[len + 1] = 0;
		return 0;
		}

+29 −0

Original line number	Diff line number	Diff line
		@@ -348,4 +348,33 @@ void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw,
		}
		EXPORT_SYMBOL_GPL(mt76x02_sta_rate_tbl_update);

		int mt76x02_insert_hdr_pad(struct sk_buff *skb)
		{
		int len = ieee80211_get_hdrlen_from_skb(skb);

		if (len % 4 == 0)
		return 0;

		skb_push(skb, 2);
		memmove(skb->data, skb->data + 2, len);

		skb->data[len] = 0;
		skb->data[len + 1] = 0;
		return 2;
		}
		EXPORT_SYMBOL_GPL(mt76x02_insert_hdr_pad);

		void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len)
		{
		int hdrlen;

		if (!len)
		return;

		hdrlen = ieee80211_get_hdrlen_from_skb(skb);
		memmove(skb->data + len, skb->data, hdrlen);
		skb_pull(skb, len);
		}
		EXPORT_SYMBOL_GPL(mt76x02_remove_hdr_pad);

		MODULE_LICENSE("Dual BSD/GPL");