diff mbox series

[5.4,19/72] net: ag71xx: remove unnecessary MTU reservation

Message ID	20210305120858.282010478@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, DENG Qingfang <dqfext@gmail.com>, Oleksij Rempel <o.rempel@pengutronix.de>, Jakub Kicinski <kuba@kernel.org> Subject: [PATCH 5.4 19/72] net: ag71xx: remove unnecessary MTU reservation Date: Fri, 5 Mar 2021 13:21:21 +0100 Message-Id: <20210305120858.282010478@linuxfoundation.org> In-Reply-To: <20210305120857.341630346@linuxfoundation.org> References: <20210305120857.341630346@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,02/72] Input: elantech - fix protocol errors for some trackpoints in SMBus mode [5.4,03/72] nvme-pci: refactor nvme_unmap_data [5.4,04/72] nvme-pci: fix error unwind in nvme_map_data [5.4,05/72] arm64 module: set plt* section addresses to 0x0 [5.4,06/72] MIPS: VDSO: Use CLANG_FLAGS instead of filtering out --target= [5.4,07/72] JFS: more checks for invalid superblock [5.4,08/72] udlfb: Fix memory leak in dlfb_usb_probe [5.4,09/72] media: mceusb: sanity check for prescaler value [5.4,10/72] erofs: fix shift-out-of-bounds of blkszbits [5.4,11/72] media: v4l2-ctrls.c: fix shift-out-of-bounds in std_validate [5.4,12/72] xfs: Fix assert failure in xfs_setattr_size() [5.4,13/72] net/af_iucv: remove WARN_ONCE on malformed RX packets [5.4,14/72] smackfs: restrict bytes count in smackfs write functions [5.4,15/72] net: fix up truesize of cloned skb in skb_prepare_for_shift() [5.4,16/72] nbd: handle device refs for DESTROY_ON_DISCONNECT properly [5.4,17/72] mm/hugetlb.c: fix unnecessary address expansion of pmd sharing [5.4,18/72] net: bridge: use switchdev for port flags set through sysfs too [5.4,19/72] net: ag71xx: remove unnecessary MTU reservation [5.4,20/72] net: fix dev_ifsioc_locked() race condition [5.4,21/72] dt-bindings: ethernet-controller: fix fixed-link specification [5.4,22/72] dt-bindings: net: btusb: DT fix s/interrupt-name/interrupt-names/ [5.4,23/72] MIPS: Drop 32-bit asm string functions [5.4,24/72] drm/virtio: use kvmalloc for large allocations [5.4,25/72] rsi: Fix TX EAPOL packet handling against iwlwifi AP [5.4,26/72] rsi: Move card interrupt handling to RX thread [5.4,27/72] rcu/nocb: Trigger self-IPI on late deferred wake up before user resume [5.4,28/72] staging: fwserial: Fix error handling in fwserial_create [5.4,29/72] x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk [5.4,30/72] vt/consolemap: do font sum unsigned [5.4,31/72] wlcore: Fix command execute failure 19 for wl12xx [5.4,32/72] Bluetooth: hci_h5: Set HCI_QUIRK_SIMULTANEOUS_DISCOVERY for btrtl [5.4,33/72] pktgen: fix misuse of BUG_ON() in pktgen_thread_worker() [5.4,34/72] ath10k: fix wmi mgmt tx queue full due to race condition [5.4,35/72] x86/build: Treat R_386_PLT32 relocation as R_386_PC32 [5.4,36/72] Bluetooth: Fix null pointer dereference in amp_read_loc_assoc_final_data [5.4,37/72] staging: most: sound: add sanity check for function argument [5.4,38/72] staging: bcm2835-audio: Replace unsafe strcpy() with strscpy() [5.4,39/72] brcmfmac: Add DMI nvram filename quirk for Predia Basic tablet [5.4,40/72] brcmfmac: Add DMI nvram filename quirk for Voyo winpad A15 tablet [5.4,41/72] drm/hisilicon: Fix use-after-free [5.4,42/72] crypto: tcrypt - avoid signed overflow in byte count [5.4,43/72] drm/amdgpu: Add check to prevent IH overflow [5.4,44/72] PCI: Add a REBAR size quirk for Sapphire RX 5600 XT Pulse [5.4,45/72] drm/amd/display: Guard against NULL pointer deref when get_i2c_info fails [5.4,46/72] media: uvcvideo: Allow entities with no pads [5.4,47/72] f2fs: handle unallocated section and zone on pinned/atgc [5.4,48/72] f2fs: fix to set/clear I_LINKABLE under i_lock [5.4,49/72] nvme-core: add cancel tagset helpers [5.4,50/72] nvme-rdma: add clean action for failed reconnection [5.4,51/72] nvme-tcp: add clean action for failed reconnection [5.4,52/72] ASoC: Intel: Add DMI quirk table to soc_intel_is_byt_cr() [5.4,53/72] btrfs: fix error handling in commit_fs_roots [5.4,54/72] perf/x86/kvm: Add Cascade Lake Xeon steppings to isolation_ucodes[] [5.4,55/72] parisc: Bump 64-bit IRQ stack size to 64 KB [5.4,56/72] sched/features: Fix hrtick reprogramming [5.4,57/72] ASoC: Intel: bytcr_rt5640: Add quirk for the Estar Beauty HD MID 7316R tablet [5.4,58/72] ASoC: Intel: bytcr_rt5640: Add quirk for the Voyo Winpad A15 tablet [5.4,59/72] ASoC: Intel: bytcr_rt5651: Add quirk for the Jumper EZpad 7 tablet [5.4,60/72] ASoC: Intel: bytcr_rt5640: Add quirk for the Acer One S1002 tablet [5.4,61/72] scsi: iscsi: Restrict sessions and handles to admin capabilities [5.4,62/72] sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output [5.4,63/72] scsi: iscsi: Ensure sysfs attributes are limited to PAGE_SIZE [5.4,64/72] scsi: iscsi: Verify lengths on passthrough PDUs [5.4,65/72] Xen/gnttab: handle p2m update errors on a per-slot basis [5.4,66/72] xen-netback: respect gnttab_map_refs()s return value [5.4,67/72] zsmalloc: account the number of compacted pages correctly [5.4,68/72] swap: fix swapfile read/write offset [5.4,69/72] media: v4l: ioctl: Fix memory leak in video_usercopy [5.4,70/72] ALSA: hda/realtek: Add quirk for Clevo NH55RZQ [5.4,71/72] ALSA: hda/realtek: Add quirk for Intel NUC 10 [5.4,72/72] ALSA: hda/realtek: Apply dual codec quirks for MSI Godlike X570 board

Commit Message

Greg Kroah-Hartman March 5, 2021, 12:21 p.m. UTC

From: DENG Qingfang <dqfext@gmail.com>

commit 04b385f325080157ab1b5f8ce1b1de07ce0d9e27 upstream.

2 bytes of the MTU are reserved for Atheros DSA tag, but DSA core
has already handled that since commit dc0fe7d47f9f.
Remove the unnecessary reservation.

Fixes: d51b6ce441d3 ("net: ethernet: add ag71xx driver")
Signed-off-by: DENG Qingfang <dqfext@gmail.com>
Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/r/20210218034514.3421-1-dqfext@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/ethernet/atheros/ag71xx.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff mbox series

Patch

--- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/drivers/net/ethernet/atheros/ag71xx.c
@@ -222,8 +222,6 @@ 
 #define AG71XX_REG_RX_SM	0x01b0
 #define AG71XX_REG_TX_SM	0x01b4
 
-#define ETH_SWITCH_HEADER_LEN	2
-
 #define AG71XX_DEFAULT_MSG_ENABLE	\
 	(NETIF_MSG_DRV			\
 	| NETIF_MSG_PROBE		\
@@ -784,7 +782,7 @@  static void ag71xx_hw_setup(struct ag71x
 
 static unsigned int ag71xx_max_frame_len(unsigned int mtu)
 {
-	return ETH_SWITCH_HEADER_LEN + ETH_HLEN + VLAN_HLEN + mtu + ETH_FCS_LEN;
+	return ETH_HLEN + VLAN_HLEN + mtu + ETH_FCS_LEN;
 }
 
 static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)