From patchwork Wed Apr 17 00:35:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 10904279 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CFFC413B5 for ; Wed, 17 Apr 2019 00:35:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B82D1287CC for ; Wed, 17 Apr 2019 00:35:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A566C28A0C; Wed, 17 Apr 2019 00:35:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18F6D287CC for ; Wed, 17 Apr 2019 00:35:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729005AbfDQAf4 (ORCPT ); Tue, 16 Apr 2019 20:35:56 -0400 Received: from mail-oi1-f195.google.com ([209.85.167.195]:33061 "EHLO mail-oi1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728237AbfDQAfz (ORCPT ); Tue, 16 Apr 2019 20:35:55 -0400 Received: by mail-oi1-f195.google.com with SMTP id e5so18619938oii.0 for ; Tue, 16 Apr 2019 17:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=z/aRtKGDL+c22EEvzqyKTDNjxFiCHW0y8XkC1pXCKLc=; b=LKv62zS3wQhs3d/EHR/zc+qUb7ANrwh2p4OK8v1BztGV/Y9zFq1odW4D+GG8+oAZDS /WPrVchFSZI70Ucn6iSnVVO0SDTg3ZUPi1Ru0P+xFhf+UToMw1iH9Wd1Em16/jvfXK/n SYAD33/yJuJgAwPDcHmj0x5E7SmrbzVLao3XSzYSZkJDyhGdyfp8k2U1Z/YrVEM7buA7 Y9Jv96Iuw5zukFpysqvvn4fvvn8av+1S3HM5c2M9bkWufeHbkccECR/Mw84MtuvJMLiG tkW5PDtxaQoaRkOehkSPOZPux/vb8wYQTgbM0yukJokTcT8zEU/Bi4UPDrRXIv+j9rbK ZCOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=z/aRtKGDL+c22EEvzqyKTDNjxFiCHW0y8XkC1pXCKLc=; b=H+ptuFCQZcyrIkcfMasJWMgTSCWgGo25xzuaTUaNyd2KJys05F8fQtE95hNI9Ldvf/ 7NQOqWBcJV54ujjg/7bAVW7Ei3z+WzR4BGxXyk3Cyla7SgSscR5DOjgkx8rQuZqwmM3L MXUaqlCueoXXe8CtTabdbOmM3WHMKsG+pjKWvujyporoQg0YZlB7etD8vP8xlF/Hwxw2 8nPZgHPYjZEh5vapoYeoUCYiEmNVudDA4Dizt1QU40Du3GEC8ylxu4JrMZ/PNter0ogI cqkKD0ys+qRwHr+BIMaIzzvGcmvtx7odT/Gm5II6WMGFAbY/9w7230ZPqeEJtUpXIigz 14Zw== X-Gm-Message-State: APjAAAXYPf0ryCXTv8dSVOZX0FYMjfnKTVaePW9F+YZXCPaRIP7d35Io iku/XpH6Y+HhDSpGlM4mh60= X-Google-Smtp-Source: APXvYqy77c6S59xg8Y5thekm+GauV60W3GlBXBEMjVvZmR4IdJv/hCo2fLCcdivyBGPou5yx/RYLXg== X-Received: by 2002:aca:f3c6:: with SMTP id r189mr24628816oih.53.1555461354966; Tue, 16 Apr 2019 17:35:54 -0700 (PDT) Received: from localhost.localdomain (cpe-24-31-245-230.kc.res.rr.com. [24.31.245.230]) by smtp.gmail.com with ESMTPSA id 96sm22374371otf.17.2019.04.16.17.35.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 17:35:54 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, pkshih@realtek.com, Larry Finger , Andrew Morton Subject: [PATCH] rtlwifi: rtl8188ee: Remove extraneous file Date: Tue, 16 Apr 2019 19:35:47 -0500 Message-Id: <20190417003547.26271-1-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.16.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Somehow file drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej was incorporated into the sources. Obviously, it can be removed. Signed-off-by: Larry Finger Reported-by: Andrew Morton Cc: Andrew Morton --- Andrew, Thanks. Larry --- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej deleted file mode 100644 index aa03d4605d8c..000000000000 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c.rej +++ /dev/null @@ -1,10 +0,0 @@ ---- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c -+++ drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c -@@ -373,6 +373,7 @@ bool rtl88ee_rx_query_desc(struct ieee80211_hw *hw, - struct rx_fwinfo_88e *p_drvinfo; - struct ieee80211_hdr *hdr; - u32 phystatus = GET_RX_DESC_PHYST(pdesc); -+ u8 wake_match; - - status->packet_report_type = (u8)GET_RX_STATUS_DESC_RPT_SEL(pdesc); - if (status->packet_report_type == TX_REPORT2)