diff mbox series

[4.14,30/65] net: stmmac: Enable 16KB buffer size

Message ID	20200122092755.081585763@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=TRKd=3L=vger.kernel.org=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, Jose Abreu <Jose.Abreu@synopsys.com>, "David S. Miller" <davem@davemloft.net> Subject: [PATCH 4.14 30/65] net: stmmac: Enable 16KB buffer size Date: Wed, 22 Jan 2020 10:29:15 +0100 Message-Id: <20200122092755.081585763@linuxfoundation.org> In-Reply-To: <20200122092750.976732974@linuxfoundation.org> References: <20200122092750.976732974@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [4.14,04/65] ALSA: seq: Fix racy access for queue timer in proc read [4.14,06/65] block: fix an integer overflow in logical block size [4.14,08/65] iio: buffer: align the size of scan bytes to size of the largest element [4.14,11/65] USB: serial: opticon: fix control-message timeouts [4.14,13/65] USB: serial: suppress driver bind attributes [4.14,15/65] USB: serial: io_edgeport: add missing active-port sanity check [4.14,17/65] USB: serial: quatech2: handle unbound ports [4.14,18/65] scsi: fnic: fix invalid stack access [4.14,21/65] usb: core: hub: Improved device recognition on remote wakeup [4.14,23/65] x86/efistub: Disable paging at mixed mode entry [4.14,25/65] perf report: Fix incorrectly added dimensions as switch perf data file [4.14,26/65] mm/shmem.c: thp, shmem: fix conflict of above-47bit hint address and PMD alignment [4.14,28/65] mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio() [4.14,29/65] net: stmmac: 16KB buffer must be 16 byte aligned [4.14,30/65] net: stmmac: Enable 16KB buffer size [4.14,32/65] USB: serial: io_edgeport: handle unbound ports on URB completion [4.14,34/65] mm/huge_memory.c: thp: fix conflict of above-47bit hint address and PMD alignment [4.14,37/65] netfilter: fix a use-after-free in mtype_destroy() [4.14,38/65] netfilter: arp_tables: init netns pointer in xt_tgdtor_param struct [4.14,39/65] NFC: pn533: fix bulk-message timeout [4.14,42/65] hv_netvsc: Fix memory leak when removing rndis device [4.14,44/65] net: hns: fix soft lockup when there is not enough memory [4.14,45/65] net: usb: lan78xx: limit size of local TSO packets [4.14,46/65] net/wan/fsl_ucc_hdlc: fix out of bounds write on array utdm_info [4.14,51/65] cw1200: Fix a signedness bug in cw1200_load_firmware() [4.14,52/65] arm64: dts: meson-gxl-s905x-khadas-vim: fix gpio-keys-polled node [4.14,54/65] tick/sched: Annotate lockless access to last_jiffies_update [4.14,58/65] scsi: qla4xxx: fix double free bug [4.14,60/65] scsi: target: core: Fix a pr_debug() argument [4.14,62/65] scsi: qla2xxx: fix rports not being mark as lost in sync fabric scan [4.14,64/65] perf probe: Fix wrong address verification

Commit Message

Greg KH Jan. 22, 2020, 9:29 a.m. UTC

From: Jose Abreu <Jose.Abreu@synopsys.com>

commit b2f3a481c4cd62f78391b836b64c0a6e72b503d2 upstream.

XGMAC supports maximum MTU that can go to 16KB. Lets add this check in
the calculation of RX buffer size.

Fixes: 7ac6653a085b ("stmmac: Move the STMicroelectronics driver")
Signed-off-by: Jose Abreu <Jose.Abreu@synopsys.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1043,7 +1043,9 @@  static int stmmac_set_bfsize(int mtu, in
 {
 	int ret = bufsize;
 
-	if (mtu >= BUF_SIZE_4KiB)
+	if (mtu >= BUF_SIZE_8KiB)
+		ret = BUF_SIZE_16KiB;
+	else if (mtu >= BUF_SIZE_4KiB)
 		ret = BUF_SIZE_8KiB;
 	else if (mtu >= BUF_SIZE_2KiB)
 		ret = BUF_SIZE_4KiB;