From patchwork Sat Jan 13 17:27:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brent Pappas X-Patchwork-Id: 187924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2614:b0:101:6a76:bbe3 with SMTP id mm20csp866170dyc; Sat, 13 Jan 2024 09:30:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHUfDX4b+kHayznz71lfsymxsXm5c5AryExV//vlCdewGIu0kOKKFo20r7H4HnkjH6y8cr6 X-Received: by 2002:a05:6808:10cb:b0:3bd:69b3:5c00 with SMTP id s11-20020a05680810cb00b003bd69b35c00mr2630520ois.86.1705167003882; Sat, 13 Jan 2024 09:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705167003; cv=none; d=google.com; s=arc-20160816; b=ANrZrPCcvKVmnMrzhgRZtZFFPXK1m477OV6UkphM7MPdNyasxf9cU1urSY2W20hHOt gBPuvaONPsyhaFH7bC4A+SClDy6/bOecr97i3FODdGQrfXmN/Kjbe+n9B3Sq+57G1w6P gs/YHj/jfuSPYIPYajN/qzNLKJsrqgGRTgk93VjEfFAvxR6LFxpWRQoSSaJqs/cEKfA0 voi2UQdYeeQfRwqE6+MQQJxKZFWpDIUCainQ/+EDuQ3GaM+m+o+XeN4NlvgBU9MPhE+A SokZGCORjAp05pZxGHYxATvAz98kxca0jTJvYSRiUbahfmStXrlROt73vnoqCE0YV1ia BdcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=lockDhjO+Z/S/G9loQhfXLYzhzz8hfL7jlKV13zw4+U=; fh=xHu2yFhxJYigtvZYalygr1zeplicdbZOlVCFYnNx1Xg=; b=X9w6Lt0PxOUUOom8gB7xU5dziZjh0evHRrthDTCcid+BDAiX91rl+gopLW6V3x5aFd RQDr/9v09z4VV5UJNLGVrjn/eKRwRWEEanQEvYKZQ9WTUsecJqAaXvivnQ0UIhHqvRrR gHkc6ei5FDb2kHMCXOwlgCsgwk2EJvihJGELO36wAMXIB8CBJlWDuNIX+LiW0X3Y4Q9H +R27rJHdSaIb9HzHK5yNnoiIpYAm4geQTGjdcK255tPcvdyYG1Bq0y+k6Rp6N12uA2/s 3OqBz+00GVjMfKLGLHSgjb1p08PElMHqq9VZi9ib46BWAUFsU8C2ot/3u//ya6jv7jxE Sa6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pappasbrent.com header.s=default header.b=RYEqEo+S; spf=pass (google.com: domain of linux-kernel+bounces-25341-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25341-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id a17-20020a056a000c9100b006d977044e1bsi5612119pfv.194.2024.01.13.09.30.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Jan 2024 09:30:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-25341-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@pappasbrent.com header.s=default header.b=RYEqEo+S; spf=pass (google.com: domain of linux-kernel+bounces-25341-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-25341-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 9B3C0282F21 for ; Sat, 13 Jan 2024 17:30:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F0F446AB9; Sat, 13 Jan 2024 17:29:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pappasbrent.com header.i=@pappasbrent.com header.b="RYEqEo+S" Received: from h5.fbrelay.privateemail.com (h5.fbrelay.privateemail.com [162.0.218.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EE5B523D; Sat, 13 Jan 2024 17:29:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pappasbrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pappasbrent.com Received: from MTA-12-4.privateemail.com (mta-12-1.privateemail.com [198.54.122.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by h5.fbrelay.privateemail.com (Postfix) with ESMTPSA id EC46160636; Sat, 13 Jan 2024 17:29:33 +0000 (UTC) Received: from mta-12.privateemail.com (localhost [127.0.0.1]) by mta-12.privateemail.com (Postfix) with ESMTP id BD54518001B5; Sat, 13 Jan 2024 12:29:24 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=pappasbrent.com; s=default; t=1705166964; bh=xJhkIgx9nO8naQQ8a/I0VKfrFGYxd2LGCl8rS/IP/vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RYEqEo+S0zGRoAnXvv9Vyg9mZu4AJI/Huv68zC6g05qFVvvhtbHXJk3HiBqWf/j92 0E/aFdTN0bAqaI0+Pno0tKI2um2t+EB2QYQEJpLJI1bHLxK02v6JHdg9pEo7XkUnRX f5svPYcj7TFaGU2YbwPeQegRqAwYooroj0WZJfr9SIjWP73+QcRs+cn4FrRHx/IxXD HCuclvLT3VI6WiOH4GOkifb9zg5eyUAZj+yNAuBiovZgOytCiUptq7Msg4afWtLuP6 cpMRP+PGqKiWFt8Z+2n2hsUcDEOjD8v9dDZl53Q4dA0of+diHUTCmdz332L8R26YS+ kRQxSx9u/X3Fw== Received: from bpappas-XPS-13-9310.cfl.rr.com (050-088-208-203.res.spectrum.com [50.88.208.203]) by mta-12.privateemail.com (Postfix) with ESMTPA; Sat, 13 Jan 2024 12:29:13 -0500 (EST) From: Brent Pappas To: bpappas@pappasbrent.com Cc: davem@davemloft.net, edumazet@google.com, johannes@sipsolutions.net, kuba@kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, pabeni@redhat.com Subject: [PATCH v2] wifi: mac80211: tx: Add __must_hold() annotation Date: Sat, 13 Jan 2024 12:27:21 -0500 Message-ID: <20240113172719.40364-3-bpappas@pappasbrent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240113011145.10888-2-bpappas@pappasbrent.com> References: <20240113011145.10888-2-bpappas@pappasbrent.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787936344740512241 X-GMAIL-MSGID: 1787997196070146491 Annotates ieee80211_set_beacon_cntdwn() with a __must_hold() annotation to make it clear that ieee80211_set_beacon_cntdwn() is only intended to be called when the caller has a lock on the argument "link." Signed-off-by: Brent Pappas --- Changelog: v1 -> v2: Include linux/compiler_types.h with angle brackets instead of quotes. net/mac80211/tx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 314998fdb1a5..ca7adace6a9c 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -10,6 +10,7 @@ * Transmit and frame generation functions. */ +#include #include #include #include @@ -4974,6 +4975,7 @@ static int ieee80211_beacon_add_tim(struct ieee80211_sub_if_data *sdata, static void ieee80211_set_beacon_cntdwn(struct ieee80211_sub_if_data *sdata, struct beacon_data *beacon, struct ieee80211_link_data *link) + __must_hold(link) { u8 *beacon_data, count, max_count = 1; struct probe_resp *resp;