From patchwork Tue Mar 31 08:58:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 228589 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DD88C2D0EF for ; Tue, 31 Mar 2020 09:20:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CBE7920658 for ; Tue, 31 Mar 2020 09:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585646411; bh=orhVSCEBXcC5KwzEYYjTBBxBvxGMor1crpLbKes0erU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SDFh0xTh+RJ7hnsF/3jhABF+Ch2DD1Duvt5dZVtty0ow6UwqaQv4DD40T35Ztm4A5 VVeXiACH5oMPKzUID9DJBYOaj7MWUjJRoB4X9pnpoDW7imena8aFD6Pzz9LfqVhnRi jpoB3UENlb0Db6VEPNWS72C6eDGHOcOZiOwoEgVU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730348AbgCaJPf (ORCPT ); Tue, 31 Mar 2020 05:15:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:35910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730754AbgCaJPe (ORCPT ); Tue, 31 Mar 2020 05:15:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 39FDD2072E; Tue, 31 Mar 2020 09:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585646133; bh=orhVSCEBXcC5KwzEYYjTBBxBvxGMor1crpLbKes0erU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iM/rlOBrvfDsC9/S8N+VA9X+L3uddC7oRkcCaVYB44kqLBM2r+6MJrz0qvtcgJjKW 20Jnzb2lPItlJIbSjFDg+YzPeDQyIIS1nb2D2Qb59/gCL0lv5yjkNL7KXvmjCEuAgV D0EL+qt9EfYxtftfdR0sNCC8Q+ErNEqN2RrX5+jE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ashish , Larry Finger , Kalle Valo Subject: [PATCH 5.4 093/155] rtlwifi: rtl8188ee: Fix regression due to commit d1d1a96bdb44 Date: Tue, 31 Mar 2020 10:58:53 +0200 Message-Id: <20200331085428.934608374@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200331085418.274292403@linuxfoundation.org> References: <20200331085418.274292403@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Larry Finger commit c80b18cbb04b7b101af9bd14550f13d9866c646a upstream. For some unexplained reason, commit d1d1a96bdb44 ("rtlwifi: rtl8188ee: Remove local configuration variable") broke at least one system. As the only net effect of the change was to remove 2 bytes from the start of struct phy_status_rpt, this patch adds 2 bytes of padding at the beginning of the struct. Fixes: d1d1a96bdb44 ("rtlwifi: rtl8188ee: Remove local configuration variable") Cc: Stable # V5.4+ Reported-by: Ashish Tested-by: Ashish Signed-off-by: Larry Finger Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 1 + 1 file changed, 1 insertion(+) --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h @@ -561,6 +561,7 @@ static inline void clear_pci_tx_desc_con rxmcs == DESC92C_RATE11M) struct phy_status_rpt { + u8 padding[2]; u8 ch_corr[2]; u8 cck_sig_qual_ofdm_pwdb_all; u8 cck_agc_rpt_ofdm_cfosho_a;