Skip to content

staging: rtl8192e: Replace struct rtllib_hdr_3addr

Philipp Hortmann linux-staging lkml 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest16 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/16staging: rtl8192e: Replace struct rtllib_hdr_1addr with ieee80211_hdrdrivers/staging/rtl8192e/rtl8192e/rtl_core.c drivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_tx.c+5 -120 replies
2/16staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_rx.cdrivers/staging/rtl8192e/rtllib_rx.c+5 -50 replies
3/16staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtl819x_BAProc.cdrivers/staging/rtl8192e/rtl819x_BAProc.c+24 -240 replies
4/16staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_softmac.cdrivers/staging/rtl8192e/rtllib_softmac.c+25 -250 replies
5/16staging: rtl8192e: Replace struct rtllib_hdr_3addr in r8192E_dev.cdrivers/staging/rtl8192e/rtl8192e/r8192E_dev.c drivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_tx.c+11 -110 replies
6/16staging: rtl8192e: Replace struct rtllib_hdr_3addr in structs of rtllib.hdrivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_rx.c drivers/staging/rtl8192e/rtllib_softmac.c+17 -270 replies
7/16staging: rtl8192e: Remove unused struct rtllib_hdr and two enumsdrivers/staging/rtl8192e/rtllib.h+0 -400 replies
8/16staging: rtl8192e: Replace struct rtllib_hdr_4addr in rtllib_crypt*.cdrivers/staging/rtl8192e/rtllib_crypt_ccmp.c drivers/staging/rtl8192e/rtllib_crypt_tkip.c+23 -230 replies
9/16staging: rtl8192e: Remove struct rtllib_hdr_4addrdrivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_rx.c+48 -590 replies
10/16staging: rtl8192e: Remove struct rtllib_hdr_3addrqosdrivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_rx.c drivers/staging/rtl8192e/rtllib_tx.c+20 -310 replies
11/16staging: rtl8192e: Remove struct rtllib_hdr_4addrqosdrivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_rx.c+9 -210 replies
12/16staging: rtl8192e: Remove struct rtllib_pspoll_hdrdrivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_softmac.c+4 -110 replies
13/16staging: rtl8192e: Replace management subframe types with IEEE80211_STYPE_*drivers/staging/rtl8192e/rtl819x_BAProc.c drivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_softmac.c+17 -310 replies
14/16staging: rtl8192e: Replace control subframe types with IEEE80211_STYPE_*drivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_rx.c drivers/staging/rtl8192e/rtllib_softmac.c +1 more+15 -300 replies
15/16staging: rtl8192e: Replace usage of RTLLIB_FCTL_DSTODS with functiondrivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_crypt_ccmp.c drivers/staging/rtl8192e/rtllib_rx.c+8 -100 replies
16/16staging: rtl8192e: Replace frame control constants with IEEE80211_FCTL_*drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c drivers/staging/rtl8192e/rtllib.h drivers/staging/rtl8192e/rtllib_crypt_tkip.c +3 more+38 -510 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/16] staging: rtl8192e: Replace struct rtllib_hdr_3addr

Replace struct rtllib_hdr_3addr and and similar structs. Replace management subframe types constants with IEEE80211_* and similar constants.

Tested with rtl8192e (WLL6130-D99) in Mode n (12.2 MB/s) Transferred this patch over wlan connection of rtl8192e.

---
Here some tests regarding sizes of structs and one pointername change:
printk("size rtllib_hdr_3addr: %ld\n",sizeof(struct rtllib_hdr_3addr)); printk("size ieee80211_hdr_3addr: %ld\n",sizeof(struct ieee80211_hdr_3addr));

[ 7413.371188] size rtllib_hdr_3addr: 24
[ 7413.371196] size ieee80211_hdr_3addr: 24

delba = (struct rtllib_hdr_3addr *)skb->data;
delba_ph = (struct ieee80211_hdr_3addr *)skb->data; pDelBaParamSet = (union delba_param_set *)&delba->payload[2]; pDelBaParamSet_ph = (union delba_param_set *)&delba_ph->seq_ctrl + 2; int ph_payload = pDelBaParamSet - pDelBaParamSet_ph; printk("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!diff: %d\n", ph_payload);

[ 5608.787297] !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!diff: 0

printk("ieee80211_hdr %ld\n",sizeof(struct ieee80211_hdr)); printk("rtllib_hdr_4addr %ld\n",sizeof(struct rtllib_hdr_4addr));

[ 8182.169990] ieee80211_hdr 30
[ 8182.170023] rtllib_hdr_4addr 30

printk("ieee80211_pspoll %ld\n",sizeof(struct ieee80211_pspoll)); printk("rtllib_pspoll_hdr %ld\n",sizeof(struct rtllib_pspoll_hdr));

[12277.846879] ieee80211_pspoll 16
[12277.846900] rtllib_pspoll_hdr 16

Philipp Hortmann (16):
staging: rtl8192e: Replace struct rtllib_hdr_1addr with ieee80211_hdr
staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_rx.c
staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtl819x_BAProc.c
staging: rtl8192e: Replace struct rtllib_hdr_3addr in rtllib_softmac.c
staging: rtl8192e: Replace struct rtllib_hdr_3addr in r8192E_dev.c
staging: rtl8192e: Replace struct rtllib_hdr_3addr in structs of
rtllib.h
staging: rtl8192e: Remove unused struct rtllib_hdr and two enums
staging: rtl8192e: Replace struct rtllib_hdr_4addr in rtllib_crypt*.c
staging: rtl8192e: Remove struct rtllib_hdr_4addr
staging: rtl8192e: Remove struct rtllib_hdr_3addrqos
staging: rtl8192e: Remove struct rtllib_hdr_4addrqos
staging: rtl8192e: Remove struct rtllib_pspoll_hdr
staging: rtl8192e: Replace management subframe types with

    IEEE80211_STYPE_*
  staging: rtl8192e: Replace control subframe types with
    IEEE80211_STYPE_*
  staging: rtl8192e: Replace usage of RTLLIB_FCTL_DSTODS with function
  staging: rtl8192e: Replace frame control constants with
    IEEE80211_FCTL_*
 .../staging/rtl8192e/rtl8192e/r8192E_dev.c    |  18 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c  |   8 +-
 drivers/staging/rtl8192e/rtl819x_BAProc.c     |  48 ++--
 drivers/staging/rtl8192e/rtllib.h             | 183 ++--------------
 drivers/staging/rtl8192e/rtllib_crypt_ccmp.c  |  17 +-
 drivers/staging/rtl8192e/rtllib_crypt_tkip.c  |  40 ++--
 drivers/staging/rtl8192e/rtllib_rx.c          | 206 +++++++++---------
 drivers/staging/rtl8192e/rtllib_softmac.c     | 100 ++++-----
 drivers/staging/rtl8192e/rtllib_tx.c          |  36 +--
 9 files changed, 257 insertions(+), 399 deletions(-)
Signature · 1 line
2.42.0