From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 138141FF808; Sun, 24 Nov 2024 13:57:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732456666; cv=none; b=IZqVQoFG1AsIoHmh0u70YFyWZzA3x27JRc3Xzuu3sMs/SwGVO4GNsRMwC5DnR+JEDm2/SpFTBL8I7LjR8mZFdhoGFSUcUKU9oITE8KsoCBKpnwAgK78H3nRM1p1ciNu8uoaGJq1ELbLvIs9SL0gilOUDEuUCOZ5LyrLDJDti0PA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732456666; c=relaxed/simple; bh=rITjNJPCl0Y8kGIrAWcsXQazJIUmkW8z/wHPAcWSIFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oNYt1imEhnG5+mQe9Ba+LFlZZ4YciCnVpBud7YEqOHWmLl2Ph6gI+inyNrFg2fmzwucw+XmXyA0tx0FIpj86yiqdRpJCdnGKjtwCxb1YjKrwf7/8WTTAFfXTJLyBGUvqXocWvhIQcA5aY0s/DV4OTIIP29BNrnXP2jrYFz+Mdw4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lKEkt07C; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lKEkt07C" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BD15C4CEDC; Sun, 24 Nov 2024 13:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1732456665; bh=rITjNJPCl0Y8kGIrAWcsXQazJIUmkW8z/wHPAcWSIFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lKEkt07C54BQd97E30uZ/ktvjPEY3kkmaKt9nHjvxwvXj1xxH6bfJaLqFFPYEbP1Z F633hjZFWg0FJQPtNUYXpJGcWM7HDp5cCUKwf0p15DoDs3FmtZSAxB+hYDVaPjG7Oe bfypDt00voiOs8cVM6JQnCE/KksCMEpnnBGtVPut21ypj/PX432t6hdsUaxeGbsIF7 rl557BjhodYKGxhM7VqGPd1YmokZeKxcY963+qtEY+Jf2IQ5J/DPk7nrTG0BfA48bZ WXW3fqY2ztxw9mYBw1d/UR0Qpav4Qp6COLUrpINbg+8urpnlX4wK6dFKgrA0WSZe8v Yql2scUxwsk4Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiapeng Chong , Abaci Robot , Kalle Valo , Sasha Levin , stas.yakovlev@gmail.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 17/21] wifi: ipw2x00: libipw_rx_any(): fix bad alignment Date: Sun, 24 Nov 2024 08:56:50 -0500 Message-ID: <20241124135709.3351371-17-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241124135709.3351371-1-sashal@kernel.org> References: <20241124135709.3351371-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.19.324 Content-Transfer-Encoding: 8bit From: Jiapeng Chong [ Upstream commit 4fa4f049dc0d9741b16c96bcbf0108c85368a2b9 ] This patch fixes incorrect code alignment. ./drivers/net/wireless/intel/ipw2x00/libipw_rx.c:871:2-3: code aligned with following code on line 882. ./drivers/net/wireless/intel/ipw2x00/libipw_rx.c:886:2-3: code aligned with following code on line 900. Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=11381 Signed-off-by: Jiapeng Chong Signed-off-by: Kalle Valo Link: https://patch.msgid.link/20241101060725.54640-1-jiapeng.chong@linux.alibaba.com Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/intel/ipw2x00/libipw_rx.c b/drivers/net/wireless/intel/ipw2x00/libipw_rx.c index 6df19f03355af..e58a5162c10e3 100644 --- a/drivers/net/wireless/intel/ipw2x00/libipw_rx.c +++ b/drivers/net/wireless/intel/ipw2x00/libipw_rx.c @@ -874,8 +874,8 @@ void libipw_rx_any(struct libipw_device *ieee, switch (ieee->iw_mode) { case IW_MODE_ADHOC: /* our BSS and not from/to DS */ - if (ether_addr_equal(hdr->addr3, ieee->bssid)) - if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) { + if (ether_addr_equal(hdr->addr3, ieee->bssid) && + ((fc & (IEEE80211_FCTL_TODS + IEEE80211_FCTL_FROMDS)) == 0)) { /* promisc: get all */ if (ieee->dev->flags & IFF_PROMISC) is_packet_for_us = 1; @@ -889,8 +889,8 @@ void libipw_rx_any(struct libipw_device *ieee, break; case IW_MODE_INFRA: /* our BSS (== from our AP) and from DS */ - if (ether_addr_equal(hdr->addr2, ieee->bssid)) - if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) { + if (ether_addr_equal(hdr->addr2, ieee->bssid) && + ((fc & (IEEE80211_FCTL_TODS + IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS)) { /* promisc: get all */ if (ieee->dev->flags & IFF_PROMISC) is_packet_for_us = 1; -- 2.43.0