Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3449126pxk; Mon, 5 Oct 2020 09:54:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/kSkL8DaBs+rV1UiI0Z0H6S+Od/zt/mbiMEE9Q3RRYbXkjbQXjMCKIgiNjMfMvgaKaMPx X-Received: by 2002:a17:906:f11:: with SMTP id z17mr712457eji.88.1601916890245; Mon, 05 Oct 2020 09:54:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601916890; cv=none; d=google.com; s=arc-20160816; b=j6HILHKlgu/MGK/6Q5FAZvQuCshJ2J53H8SGWFK0HDsUHSkmcYvoYf/+pEqxomRRf/ IJVrtEh+HMM7Qmf7ukeMKi0wElm/NZfmdh5xVJoeM5deRIzBtpQ1VWUP+t7X9mWAWYbK CXwFfy8D6ksVlFjUC1uifHuLhCJKz40nG65jqmWOIk5YGplKDhA7lVkl0+DtT5ZnAKnV ntJNYktD7WSjjG+HfdyYIvkT1Wd68WDk5D4AX8GeiZC7WLiWWJaYWxEGJU7aY9wCxNMK eG7jDXAWw1t8P9t2wdj4dgUPNRSTlOvDYy3xa4hpIPRPvRWhIOY/bZCAjI1uz2AA9sqR nxnw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XttVFhC6CuECv6Zdz2jY/GIfGqcm86qlzP8CyMz97KQ=; b=a+498ut8Jn5P8u2jsrXsco+yVwkKmGeNItXb+EMAZ5uoa328VaNfijVc7RtVJ/WfWV FFiWHXLu7bNPT1eEoaJ+qu6HRVW/ii0IU4Zbk2hJJclvKHLUqP5zOA7cC99EuQeVzItd xNKp5hpIV7Y+tKjNRfdvkmY5fMpvDts44jAwFlG2D1IKtbp2kTIVw5qeGpANxSLUu2WH Svs5a6DTqe7/bsSpimndCUTEvs/0H7kyL3EuzwN56JG4Y1H8gs0UnK88DhnRQloJ8eow gDAhZ0YKpzQqyvsyHE5VOjjyCG7/ReZeDO3lizQwW64ku+CMurM5583a9BHRv53M+gZj H69w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cXBwnqDc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pv2si99005ejb.681.2020.10.05.09.54.27; Mon, 05 Oct 2020 09:54:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=default header.b=cXBwnqDc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727617AbgJEP3X (ORCPT + 99 others); Mon, 5 Oct 2020 11:29:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:55082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727560AbgJEP3S (ORCPT ); Mon, 5 Oct 2020 11:29:18 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1CED02137B; Mon, 5 Oct 2020 15:29:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911757; bh=VW7oyLa117MEhwsbhxJr47yJfKkS4dQAVPEAdzhonsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cXBwnqDc+ot+bvn5fHx7XbHnsyBHq7G8xE514Dc93tEz//5qfqwXKWNM7LExcI/pm Uq5VYQ+mgXsOujN40GxmFnes3RMwPwUjwx7CXDlny4fL/EAdQp98o6zPu/VrckWPTw 1CUBiIWLLcu1pfieQYaLDwv1l1mYYxkcQ7xNXj94= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Fietkau , Johannes Berg , Sasha Levin Subject: [PATCH 5.4 27/57] mac80211: do not allow bigger VHT MPDUs than the hardware supports Date: Mon, 5 Oct 2020 17:26:39 +0200 Message-Id: <20201005142111.110973817@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142109.796046410@linuxfoundation.org> References: <20201005142109.796046410@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Felix Fietkau [ Upstream commit 3bd5c7a28a7c3aba07a2d300d43f8e988809e147 ] Limit maximum VHT MPDU size by local capability. Signed-off-by: Felix Fietkau Link: https://lore.kernel.org/r/20200917125031.45009-1-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/vht.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c index ccdcb9ad9ac72..aabc63dadf176 100644 --- a/net/mac80211/vht.c +++ b/net/mac80211/vht.c @@ -168,10 +168,7 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, /* take some capabilities as-is */ cap_info = le32_to_cpu(vht_cap_ie->vht_cap_info); vht_cap->cap = cap_info; - vht_cap->cap &= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 | - IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 | - IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 | - IEEE80211_VHT_CAP_RXLDPC | + vht_cap->cap &= IEEE80211_VHT_CAP_RXLDPC | IEEE80211_VHT_CAP_VHT_TXOP_PS | IEEE80211_VHT_CAP_HTC_VHT | IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK | @@ -180,6 +177,9 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN | IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN; + vht_cap->cap |= min_t(u32, cap_info & IEEE80211_VHT_CAP_MAX_MPDU_MASK, + own_cap.cap & IEEE80211_VHT_CAP_MAX_MPDU_MASK); + /* and some based on our own capabilities */ switch (own_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) { case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ: -- 2.25.1