From patchwork Mon Mar 26 09:18:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quytelda Kahja X-Patchwork-Id: 10307481 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.web.codeaurora.org (Postfix) with ESMTP id 96E69600CC for ; Mon, 26 Mar 2018 09:19:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E008295E2 for ; Mon, 26 Mar 2018 09:19:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81C26295E5; Mon, 26 Mar 2018 09:19:12 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 440E9295E2 for ; Mon, 26 Mar 2018 09:19:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751074AbeCZJS7 (ORCPT ); Mon, 26 Mar 2018 05:18:59 -0400 Received: from mout.perfora.net ([74.208.4.194]:40167 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751024AbeCZJS6 (ORCPT ); Mon, 26 Mar 2018 05:18:58 -0400 Received: from kahja.local ([73.170.116.139]) by mrelay.perfora.net (mreueus003 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MWhiv-1f3QFX0HkJ-00Xscx; Mon, 26 Mar 2018 11:18:48 +0200 From: Quytelda Kahja To: lkp@intel.com, gregkh@linuxfoundation.org Cc: kbuild-all@01.org, johannes@sipsolutions.net, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Quytelda Kahja Subject: [PATCH] staging: rtl8723bs: Remove duplicate #defines. Date: Mon, 26 Mar 2018 02:18:30 -0700 Message-Id: <20180326091830.30132-1-quytelda@tamalin.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: References: X-Provags-ID: V03:K0:9azq8aBpn/8VhhbTTnQnjeV/m7bF0b8fyJo91zik8TUESvpbtr7 HghvSWH7YrSr1ILqTl+BTn+I81uwlVuiJzmz9zewr2gKPxy96uuSzZJ0SsyBhT86xzfECa0 isU7T+yluNhvVUEIty7GCkXglcnoNxJ5z0YUdgaK0dqQb3vVlNI9WUCmltueMjXYAJiNrFP Y2BTb0i3FlEDJgb3k1mKQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:46R1lUJ83x4=:KS2Ix9WRkPcmFJGUJkvEjS PB+pABQ+Ucv8LPCVtfUQO/X9rTOi9vDRVpgvccFs+vd7mODa6HStV2+wO1WvrdoN5PGL+CSER 0xncg0uEGn9wKZfIrw2aksxdDuPO92S6MU13KuGlmJiyxsd8DVXiyrnx0yFMYFMmVP6f91zUv /aK4q3nHqZye7lEHmOuIIMq0HuUN5EdkFHdMfyySZmFcDyjqb4yla1CTbqF0j9AsBGU1OaMci 3g4UEJQ4LoaWn8jA7kaosnDVAldcuXNrj/C48hNkIPFCpgVcoPENHLiM3KIPVqajdeQ3C0Cb6 SNVGk6OMA3SHlTRDhqPOoEsidFnBViygmnE34cyNhZBBX97sOxkipt1SZO6A/vlCrKZgMlu5X CmJ79uvCaLRw2wDddz62wTjxMv0G8wycnwWV40vGmp6upROF4ySwz65b7+OyCEEtcL/lWfvaK MCg8W8cpUBHBJCuLI8u/uAFFw5XuMzsDxx4nw5vYGIp1asOEtsKkm2tSSTdUKzYzsN3J1cSBX h3gSxNHK2VOw4MH2pz8IyvXrDHvI2gDviDD8nZdmi60iq3dQgmQscmkM3QMpJK/E+ADByGLjz ypFGNND+sx5YYBx54K7vX8s6gJ1HxWI5J5b7Tbo6uwS07776szXrH80Yz6sQoGl+3AUoajU42 E6wS6aPMib5EL4V9RTYv/JYKBq9Ey+ZqBBh2fCGEU0BckeMyzsvCUiil2zpZ7fwPCKD6QPUn9 2o71bLJdS0Z3Pov3vCeG71+EtBFhy+sZe3CmSA== 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 The modified file includes 'linux/ieee80211.h', but redefines many constants that already exist in the header. This will create a conflict if the values are ever changed in the kernel. Signed-off-by: Quytelda Kahja --- drivers/staging/rtl8723bs/include/ieee80211.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h index 73ce63770c3c..a2402495f447 100644 --- a/drivers/staging/rtl8723bs/include/ieee80211.h +++ b/drivers/staging/rtl8723bs/include/ieee80211.h @@ -435,19 +435,7 @@ struct ieee80211_snap_hdr { #define WLAN_GET_SEQ_SEQ(seq) ((seq) & RTW_IEEE80211_SCTL_SEQ) /* Authentication algorithms */ -#define WLAN_AUTH_OPEN 0 -#define WLAN_AUTH_SHARED_KEY 1 - -#define WLAN_AUTH_CHALLENGE_LEN 128 - #define WLAN_CAPABILITY_BSS (1<<0) -#define WLAN_CAPABILITY_IBSS (1<<1) -#define WLAN_CAPABILITY_CF_POLLABLE (1<<2) -#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3) -#define WLAN_CAPABILITY_PRIVACY (1<<4) -#define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5) -#define WLAN_CAPABILITY_PBCC (1<<6) -#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7) #define WLAN_CAPABILITY_SHORT_SLOT (1<<10) /* Status codes */