Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3270678pxb; Sun, 7 Feb 2021 03:50:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJw19w6wV5JqC0JmSiyMPb0QoIm+yWHJejOFPebgSfGG9zT0sB77AGOceTLgkPhY8ELrsI0K X-Received: by 2002:a17:906:1d51:: with SMTP id o17mr12379614ejh.85.1612698619880; Sun, 07 Feb 2021 03:50:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612698619; cv=none; d=google.com; s=arc-20160816; b=hDLF2JNlRCMOndNr6nz/4E00/96U8q7FIDuVuqIk6bGcHAw58B2RYACLC3nAk+15Ct Alu1Tq2N7lr1nH++ulSgFCoaMUFJX8/rNmnOnZhxyKo9Bu0d3Z2tRplI+taLj62SoZHQ EzfICN4SrRLh0ZvHJ4zuZcS0XQTXLxIVz1Rc8fsgvXeCv/BxrvDNJzlgqlZiVnoCMzjz eDUWs21nscZw7446y/EFW6ZLlCcSylUPdqfvmjBjELAKoD/IFtT4b23u8z4NI2/WER2h Hm4Nms2h0Ik14eso5/n1kqLu2WmQraNO7Z3Zo2pNeKdqDh1xK0DwASWw6bmPBv+Bq3UM y7JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=+LBLLZuNZkP0cdvb1itzwGUEiskGV0ZG7VAWf5MWK+8=; b=zhAc1t5ErbWD89h5pIMDy7z+N3ijl4HWlE/ujvH9Bm1yEeQQGOTmVQR808+lsJlt96 VtGuI1x2zLevFQZ0o3aPalGHVTfHye9OovffjcRQ8TisJxHF39YEOcqXh31Wfp6nxRxE u+TEBfY4YGM4755mky4oxIDwbZXaNFvV6aa6ZCVIM1nhoWKWmjV3ypJmrnRSucBtTCdb H35Wlqv+sUbjbaFrMQdlr4P5ve8BF1Mus4w58wkDG9SxQgnlJZekIPzhm9R0zCdm4Gq9 tfa3196dlYGNH0Xj1ZnHpReI0ZcHF9+VsId2bRrlcsbzlmm2sWMC6HgosxWVMZFgtDyN gHkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bpRSQ3KU; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y11si10487944ejd.56.2021.02.07.03.49.46; Sun, 07 Feb 2021 03:50:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bpRSQ3KU; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229771AbhBGLte (ORCPT + 99 others); Sun, 7 Feb 2021 06:49:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:34148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229681AbhBGLtV (ORCPT ); Sun, 7 Feb 2021 06:49:21 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id AB63064E40; Sun, 7 Feb 2021 11:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612698520; bh=w/mIgUYWtnaVsHbnu+zkFd2Mui3g5R3DriFeAuXMp7w=; h=From:To:Cc:Subject:Date:From; b=bpRSQ3KUneRnJx3ek/e7hRi+9ivth/iDGAPK7js0Q+VSDGPpI6u1ExBY9cONpGvbP 605yOMT5AM3ueTHQHZ5wtFMQmpFXDnsJPNVekJUN5jpePyxzjMr6uYOOzcRpQTJqIM sIZ1iVTNBwmkHbSSgvOlZ6XCacRFvfm3WBMKt1CHGZEh+y2sRfTNybyi4Ybb3W5IeU 3aApqhWNcNWSZ3Fewb8+XmHdi36ijkwO/mtCjdLtSBljk1qa96jIFg2ixVDpbenjx5 rcv87WRNZBpviBo+daOp+hS0kWhqEwLO5WfDnrua9Fr5YqLZ+LgjEiPFpXi7FFM840 xbvVhNlnAK4+g== From: Lorenzo Bianconi To: linux-wireless@vger.kernel.org Cc: kvalo@codeaurora.org, kuba@kernel.org, nbd@nbd.name, lorenzo.bianconi@redhat.com Subject: [PATCH wireless-drivers] mt76: dma: do not report truncated frames to mac80211 Date: Sun, 7 Feb 2021 12:48:31 +0100 Message-Id: X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org If the fragment is discarded in mt76_add_fragment() since shared_info frag array is full, discard truncated frames and do not forward them to mac80211. Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/dma.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c index e81dfaf99bcb..9bf13994c036 100644 --- a/drivers/net/wireless/mediatek/mt76/dma.c +++ b/drivers/net/wireless/mediatek/mt76/dma.c @@ -511,13 +511,13 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, { struct sk_buff *skb = q->rx_head; struct skb_shared_info *shinfo = skb_shinfo(skb); + int nr_frags = shinfo->nr_frags; - if (shinfo->nr_frags < ARRAY_SIZE(shinfo->frags)) { + if (nr_frags < ARRAY_SIZE(shinfo->frags)) { struct page *page = virt_to_head_page(data); int offset = data - page_address(page) + q->buf_offset; - skb_add_rx_frag(skb, shinfo->nr_frags, page, offset, len, - q->buf_size); + skb_add_rx_frag(skb, nr_frags, page, offset, len, q->buf_size); } else { skb_free_frag(data); } @@ -526,7 +526,10 @@ mt76_add_fragment(struct mt76_dev *dev, struct mt76_queue *q, void *data, return; q->rx_head = NULL; - dev->drv->rx_skb(dev, q - dev->q_rx, skb); + if (nr_frags < ARRAY_SIZE(shinfo->frags)) + dev->drv->rx_skb(dev, q - dev->q_rx, skb); + else + dev_kfree_skb(skb); } static int -- 2.29.2