From patchwork Mon Oct 7 18:10:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 833921 Received: from sipsolutions.net (s3.sipsolutions.net [168.119.38.16]) (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 BDD861DDA3B; Mon, 7 Oct 2024 18:15:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=168.119.38.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728324957; cv=none; b=ky1Ehy3GhWhub7TclFT4GHw4kAg3Sum95p35OevOqPumqwmF8BfxXpGPv2CIrFZRSYifb5KG6ErRUaStpRPxwTSzcQSWhoXWlvpjB/CKQ4u0ycQ9z05ufUs6rigU0Sa2KAqegiTsORd/thIVvYnuag/V51Fzh+KIerHzred7QV4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728324957; c=relaxed/simple; bh=/EkMCLx0AbP10BCKySQUIgQd8w6wQL20RgEYBd7heQ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=f0LuUZyElVfJQVbEL9IGVZzIJ0czGvwpVFkk2PP775zFjXO52+2V5agpKHuOC+KUW9KCoNGcPdL0OocnjUW4y0UYezUPqIiemv6HDGOXkmn0s2U3dChIjh+N/zDgexK9D/YL7rMWVLsCd7upof8Qi8L/Oeqc9kbyPe/+6txZE5g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sipsolutions.net; spf=pass smtp.mailfrom=sipsolutions.net; dkim=pass (2048-bit key) header.d=sipsolutions.net header.i=@sipsolutions.net header.b=WplmWmq4; arc=none smtp.client-ip=168.119.38.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sipsolutions.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sipsolutions.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sipsolutions.net header.i=@sipsolutions.net header.b="WplmWmq4" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sipsolutions.net; s=mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Content-Type:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-To: Resent-Cc:Resent-Message-ID; bh=L/qJQRiy1F0iW63iLg2xKj6+4X+m0wja3F7ZSKNSsKo=; t=1728324954; x=1729534554; b=WplmWmq4t8tMfinw+Lv8YxvClK6/RiwUt8rg6xrlf45b/2C Nr48a1p9vVTZ8fompag3mgmvKewFkgz+RiOyl8I3O0KcHfeBD9jDFSFfmh48o9OfTdRmIreRgj43I H8wtMG3K9BxPRKSeWYYWKuu/naiXyC/3Kz2ghu5ZHlA5EuxmMOPQDOR/LRuKPFiIIrxHY3bct0NXi XiLTwJjEdRWvAyoJUKvS4QSqGnYJVRVr1ZWw3lS+mcZyYvax3Y9P3Rdg7zTXy+dCZPsjR8gr+6cXz dgzp1i6/qSnySLlRSDhQg8eEcuYx98oNMMGXZR3ObmFYAgxdd6CH1f/kcbK7DTBg==; Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.98) (envelope-from ) id 1sxsGt-00000003TpG-38rP; Mon, 07 Oct 2024 20:15:51 +0200 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: Greg Kroah-Hartman , linux-staging@lists.linux.dev, Johannes Berg Subject: [PATCH 2/5] wifi: mwifiex: don't include lib80211.h Date: Mon, 7 Oct 2024 20:10:52 +0200 Message-ID: <20241007201545.74be9cca3eb8.I47b2e8e2d09c0a0be1f8346478d3d908b4021abd@changeid> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007181545.63207-7-johannes@sipsolutions.net> References: <20241007181545.63207-7-johannes@sipsolutions.net> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Johannes Berg This really should never have been used, it's ancient code, but then the driver needs its own define for NUM_WEP_KEYS. Signed-off-by: Johannes Berg --- drivers/net/wireless/marvell/mwifiex/ioctl.h | 2 +- drivers/net/wireless/marvell/mwifiex/main.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/ioctl.h b/drivers/net/wireless/marvell/mwifiex/ioctl.h index 516159b721d3..74747d3a379a 100644 --- a/drivers/net/wireless/marvell/mwifiex/ioctl.h +++ b/drivers/net/wireless/marvell/mwifiex/ioctl.h @@ -8,7 +8,7 @@ #ifndef _MWIFIEX_IOCTL_H_ #define _MWIFIEX_IOCTL_H_ -#include +#define NUM_WEP_KEYS 4 enum { MWIFIEX_SCAN_TYPE_UNCHANGED = 0, diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h index 566adce3413c..366590236ed7 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include