Skip to content

staging/rtl8xxx: delete ieee80211 constant duplication

Paul Gortmaker lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest8 patches 6 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8rtl8188eu: don't duplicate ieee80211 constants for status/reasondrivers/staging/rtl8188eu/core/rtw_ap.c drivers/staging/rtl8188eu/core/rtw_mlme_ext.c drivers/staging/rtl8188eu/core/rtw_recv.c +3 more+13 -1090 replies
2/8rtl8712: don't duplicate ieee80211 constants for status/reasondrivers/staging/rtl8712/ieee80211.h+0 -290 replies
3/8rtl8192u: don't trample on <linux/ieee80211.h> struct namespacedrivers/staging/rtl8192u/ieee80211/ieee80211.h drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c +5 more+127 -1273 replies
4/8rtl8192u: promote auth_mode to a full 8 bitsdrivers/staging/rtl8192u/ieee80211/ieee80211.h+2 -20 replies
5/8rtl8192u: align local ieee80211_wmm_ac_param struct fields with globaldrivers/staging/rtl8192u/ieee80211/ieee80211.h drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c+7 -70 replies
6/8rtl8192u: don't duplicate ieee80211 constants for status/auth/reasondrivers/staging/rtl8192u/ieee80211/ieee80211.h+1 -760 replies
7/8rtl8192u: delete another embedded instance of generic reason codesdrivers/staging/rtl8192u/ieee80211/ieee80211.h+0 -480 replies
8/8rtl8192e: delete local copy of iee80211 reason codes.drivers/staging/rtl8192e/rtl8192e/rtl_core.c drivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_softmac.c+4 -410 replies

Reviews trailers per patch

None of the 8 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchLarry Finger
SeriesA-b
1/8
2/8
3/8
4/8
5/8
6/8
7/8
8/8

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/8] staging/rtl8xxx: delete ieee80211 constant duplication

While looking at a non-staging wifi driver, I was searching for a constant definition for an error code, and in addition to the expected one living in the main include dir, I found a whole bunch of local copies in the staging dir rtl8xxx wifi drivers. This duplication covers the families of WLAN_STATUS_<text> and WLAN_REASON_<text> values.

While one can understand that these things were wholesale copied at one point to simplify out of tree building, we don't want duplicated stuff for drivers that are in tree. Even if they are in staging, they will need cleanups like this if they ever want to get out of staging.

Some could be removed and trivially replaced with the associated include of <linux/ieee80211.h> but for a couple of others a couple of struct fields had to be renamed to align with the main include first, and a struct namespace collision between the main include and the local ones had to be resolved to allow the duplicate constant removal as well.

Compile tested only, but the changes seem trivial enough so as to be presumably zero runtime impact (famous last words....)

---

Paul Gortmaker (8):
rtl8188eu: don't duplicate ieee80211 constants for status/reason
rtl8712: don't duplicate ieee80211 constants for status/reason
rtl8192u: don't trample on <linux/ieee80211.h> struct namespace
rtl8192u: promote auth_mode to a full 8 bits
rtl8192u: align local ieee80211_wmm_ac_param struct fields with global
rtl8192u: don't duplicate ieee80211 constants for status/auth/reason
rtl8192u: delete another embedded instance of generic reason codes
rtl8192e: delete local copy of iee80211 reason codes.

 drivers/staging/rtl8188eu/core/rtw_ap.c            |   2 +
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |  10 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c          |   2 +
 drivers/staging/rtl8188eu/include/ieee80211.h      |  29 +---
 drivers/staging/rtl8188eu/include/wifi.h           |  77 ----------
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |   2 +
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |   3 +-
 drivers/staging/rtl8192e/rtllib.h                  |  39 -----
 drivers/staging/rtl8192e/rtllib_softmac.c          |   3 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211.h     | 171 +++------------------
 .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c      |  10 +-
 .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c      |  26 ++--
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |  76 ++++-----
 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |  32 ++--
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |  14 +-
 .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c    |  48 +++---
 drivers/staging/rtl8192u/r8192U_core.c             |  12 +-
 drivers/staging/rtl8712/ieee80211.h                |  29 ----
 18 files changed, 150 insertions(+), 435 deletions(-)
Signature · 1 line
2.2.1