From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Jes Sorensen <Jes.Sorensen@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH 2/8] rtl8712: don't duplicate ieee80211 constants for status/reason
Date: Mon, 27 Apr 2015 01:25:35 -0400 [thread overview]
Message-ID: <1430112341-21402-3-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1430112341-21402-1-git-send-email-paul.gortmaker@windriver.com>
These are all defined as a part of the standard and should not be
duplicated on a per-driver basis. Use the global ones and delete the
local ones.
It seems that ieee80211 was already included everywhere it was needed,
since no explicit include <...> were needed to be added in order to
preserve getting a successful compile.
This isn't the totality of duplicated data removed, but it is a start.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
drivers/staging/rtl8712/ieee80211.h | 29 -----------------------------
1 file changed, 29 deletions(-)
diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
index 8269be80437a..6e813a9c1aa2 100644
--- a/drivers/staging/rtl8712/ieee80211.h
+++ b/drivers/staging/rtl8712/ieee80211.h
@@ -314,35 +314,6 @@ struct ieee80211_snap_hdr {
#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7)
#define WLAN_CAPABILITY_SHORT_SLOT (1<<10)
-/* Status codes */
-#define WLAN_STATUS_SUCCESS 0
-#define WLAN_STATUS_UNSPECIFIED_FAILURE 1
-#define WLAN_STATUS_CAPS_UNSUPPORTED 10
-#define WLAN_STATUS_REASSOC_NO_ASSOC 11
-#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12
-#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13
-#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14
-#define WLAN_STATUS_CHALLENGE_FAIL 15
-#define WLAN_STATUS_AUTH_TIMEOUT 16
-#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17
-#define WLAN_STATUS_ASSOC_DENIED_RATES 18
-/* 802.11b */
-#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19
-#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20
-#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21
-
-/* Reason codes */
-#define WLAN_REASON_UNSPECIFIED 1
-#define WLAN_REASON_PREV_AUTH_NOT_VALID 2
-#define WLAN_REASON_DEAUTH_LEAVING 3
-#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4
-#define WLAN_REASON_DISASSOC_AP_BUSY 5
-#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6
-#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7
-#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8
-#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9
-
-
/* Information Element IDs */
#define WLAN_EID_SSID 0
#define WLAN_EID_SUPP_RATES 1
--
2.2.1
next prev parent reply other threads:[~2015-04-27 5:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-27 5:25 [PATCH 0/8] staging/rtl8xxx: delete ieee80211 constant duplication Paul Gortmaker
2015-04-27 5:25 ` [PATCH 1/8] rtl8188eu: don't duplicate ieee80211 constants for status/reason Paul Gortmaker
2015-04-27 5:25 ` Paul Gortmaker [this message]
2015-04-27 5:25 ` [PATCH 3/8] rtl8192u: don't trample on <linux/ieee80211.h> struct namespace Paul Gortmaker
2015-04-30 13:52 ` Jes Sorensen
2015-04-30 14:22 ` Paul Gortmaker
2015-04-30 14:30 ` Jes Sorensen
2015-04-27 5:25 ` [PATCH 4/8] rtl8192u: promote auth_mode to a full 8 bits Paul Gortmaker
2015-04-27 5:25 ` [PATCH 5/8] rtl8192u: align local ieee80211_wmm_ac_param struct fields with global Paul Gortmaker
2015-04-27 5:25 ` [PATCH 6/8] rtl8192u: don't duplicate ieee80211 constants for status/auth/reason Paul Gortmaker
2015-04-27 5:25 ` [PATCH 7/8] rtl8192u: delete another embedded instance of generic reason codes Paul Gortmaker
2015-04-27 5:25 ` [PATCH 8/8] rtl8192e: delete local copy of iee80211 " Paul Gortmaker
2015-04-27 17:12 ` [PATCH 0/8] staging/rtl8xxx: delete ieee80211 constant duplication Larry Finger
2015-06-17 16:32 ` Jakub Sitnicki
2015-06-17 18:01 ` Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430112341-21402-3-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=Jes.Sorensen@redhat.com \
--cc=Larry.Finger@lwfinger.net \
--cc=florian.c.schilhabel@googlemail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox