]> Git Repo - linux.git/commitdiff
Merge 5.12-rc6 into staging-next
authorGreg Kroah-Hartman <[email protected]>
Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
committerGreg Kroah-Hartman <[email protected]>
Mon, 5 Apr 2021 06:57:44 +0000 (08:57 +0200)
We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
1  2 
MAINTAINERS
drivers/staging/rtl8192e/rtllib_rx.c

diff --combined MAINTAINERS
index 00272c2f5393f28725a7d049139846c4552238b3,c80ad735b384066fd776a8a54d60a2d65b7ddcb2..f11c9f11158f35af5c0b59ca0f849ccda209c1ee
@@@ -300,6 -300,7 +300,6 @@@ M: Syed Nayyar Waris <syednwaris@gmail.
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-counter-104-quad-8
 -F:    Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
  F:    drivers/counter/104-quad-8.c
  
  ACCES PCI-IDIO-16 GPIO DRIVER
@@@ -2488,7 -2489,7 +2488,7 @@@ N:      sc27x
  N:    sc2731
  
  ARM/STI ARCHITECTURE
- M:    Patrice Chotard <[email protected]>
+ M:    Patrice Chotard <patrice.chotard@foss.st.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  W:    http://www.stlinux.com
@@@ -2521,7 -2522,7 +2521,7 @@@ F:      include/linux/remoteproc/st_slim_rpr
  
  ARM/STM32 ARCHITECTURE
  M:    Maxime Coquelin <[email protected]>
- M:    Alexandre Torgue <[email protected]>
+ M:    Alexandre Torgue <alexandre.torgue@foss.st.com>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -3114,7 -3115,7 +3114,7 @@@ C:      irc://irc.oftc.net/bcach
  F:    drivers/md/bcache/
  
  BDISP ST MEDIA DRIVER
- M:    Fabien Dessenne <[email protected]>
+ M:    Fabien Dessenne <fabien.dessenne@foss.st.com>
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
@@@ -3674,7 -3675,7 +3674,7 @@@ M:      [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://github.com/broadcom/stblinux.git
- F:    drivers/soc/bcm/bcm-pmb.c
+ F:    drivers/soc/bcm/bcm63xx/bcm-pmb.c
  F:    include/dt-bindings/soc/bcm-pmb.h
  
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
@@@ -5079,7 -5080,7 +5079,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell/dell-wmi.c
  
  DELTA ST MEDIA DRIVER
- M:    Hugues Fruchet <[email protected]>
+ M:    Hugues Fruchet <hugues.fruchet@foss.st.com>
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
@@@ -6005,7 -6006,6 +6005,6 @@@ F:      drivers/gpu/drm/rockchip
  
  DRM DRIVERS FOR STI
  M:    Benjamin Gaignard <[email protected]>
- M:    Vincent Abriou <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6013,10 -6013,9 +6012,9 @@@ F:     Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/sti
  
  DRM DRIVERS FOR STM
- M:    Yannick Fertre <[email protected]>
- M:    Philippe Cornu <[email protected]>
+ M:    Yannick Fertre <yannick.fertre@foss.st.com>
+ M:    Philippe Cornu <philippe.cornu@foss.st.com>
  M:    Benjamin Gaignard <[email protected]>
- M:    Vincent Abriou <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7384,6 -7383,14 +7382,6 @@@ F:     Documentation/hwmon/gsc-hwmon.rs
  F:    drivers/hwmon/gsc-hwmon.c
  F:    include/linux/platform_data/gsc_hwmon.h
  
 -GASKET DRIVER FRAMEWORK
 -M:    Rob Springer <[email protected]>
 -M:    Todd Poynor <[email protected]>
 -M:    Ben Chan <[email protected]>
 -M:    Richard Yeh <[email protected]>
 -S:    Maintained
 -F:    drivers/staging/gasket/
 -
  GCC PLUGINS
  M:    Kees Cook <[email protected]>
  L:    [email protected]
@@@ -7467,8 -7474,9 +7465,9 @@@ F:      include/uapi/asm-generic
  GENERIC PHY FRAMEWORK
  M:    Kishon Vijay Abraham I <[email protected]>
  M:    Vinod Koul <[email protected]>
- L:    linux-[email protected].org
+ L:    linux-[email protected].org
  S:    Supported
+ Q:    https://patchwork.kernel.org/project/linux-phy/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git
  F:    Documentation/devicetree/bindings/phy/
  F:    drivers/phy/
@@@ -8221,7 -8229,7 +8220,7 @@@ F:      include/linux/hugetlb.
  F:    mm/hugetlb.c
  
  HVA ST MEDIA DRIVER
- M:    Jean-Christophe Trotin <[email protected]>
+ M:    Jean-Christophe Trotin <jean-christophe.trotin@foss.st.com>
  L:    [email protected]
  S:    Supported
  W:    https://linuxtv.org
@@@ -8511,6 -8519,7 +8510,7 @@@ IBM Power SRIOV Virtual NIC Device Driv
  M:    Dany Madden <[email protected]>
  M:    Lijun Pan <[email protected]>
  M:    Sukadev Bhattiprolu <[email protected]>
+ R:    Thomas Falcon <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmvnic.*
@@@ -8682,15 -8691,10 +8682,15 @@@ S:   Maintaine
  F:    Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt
  F:    drivers/iio/multiplexer/iio-mux.c
  
 +IIO SCMI BASED DRIVER
 +M:    Jyoti Bhayana <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/iio/common/scmi_sensors/scmi_iio.c
 +
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <[email protected]>
  R:    Lars-Peter Clausen <[email protected]>
 -R:    Peter Meerwald-Stadler <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
@@@ -9285,13 -9289,6 +9285,13 @@@ F:    include/dt-bindings/interconnect
  F:    include/linux/interconnect-provider.h
  F:    include/linux/interconnect.h
  
 +INTERRUPT COUNTER DRIVER
 +M:    Oleksij Rempel <[email protected]>
 +R:    Pengutronix Kernel Team <[email protected]>
 +L:    [email protected]
 +F:    Documentation/devicetree/bindings/counter/interrupt-counter.yaml
 +F:    drivers/counter/interrupt-cnt.c
 +
  INVENSENSE ICM-426xx IMU DRIVER
  M:    Jean-Baptiste Maneyrol <[email protected]>
  L:    [email protected]
@@@ -10032,7 -10029,6 +10032,6 @@@ F:   scripts/leaking_addresses.p
  
  LED SUBSYSTEM
  M:    Pavel Machek <[email protected]>
- R:    Dan Murphy <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git
@@@ -10908,7 -10904,6 +10907,6 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/radio/radio-maxiradio*
  
  MCAN MMIO DEVICE DRIVER
- M:    Dan Murphy <[email protected]>
  M:    Pankaj Sharma <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -11169,7 -11164,7 +11167,7 @@@ T:   git git://linuxtv.org/media_tree.gi
  F:    drivers/media/dvb-frontends/stv6111*
  
  MEDIA DRIVERS FOR STM32 - DCMI
- M:    Hugues Fruchet <[email protected]>
+ M:    Hugues Fruchet <hugues.fruchet@foss.st.com>
  L:    [email protected]
  S:    Supported
  T:    git git://linuxtv.org/media_tree.git
@@@ -12540,7 -12535,7 +12538,7 @@@ NETWORKING [MPTCP
  M:    Mat Martineau <[email protected]>
  M:    Matthieu Baerts <[email protected]>
  L:    [email protected]
- L:    mptcp@lists.01.org
+ L:    mptcp@lists.linux.dev
  S:    Maintained
  W:    https://github.com/multipath-tcp/mptcp_net-next/wiki
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
@@@ -14711,15 -14706,11 +14709,11 @@@ F:        drivers/net/ethernet/qlogic/qlcnic
  QLOGIC QLGE 10Gb ETHERNET DRIVER
  M:    Manish Chopra <[email protected]>
  M:    [email protected]
- L:    [email protected]
- S:    Supported
- F:    drivers/staging/qlge/
- QLOGIC QLGE 10Gb ETHERNET DRIVER
  M:    Coiby Xu <[email protected]>
  L:    [email protected]
- S:    Maintained
+ S:    Supported
  F:    Documentation/networking/device_drivers/qlogic/qlge.rst
+ F:    drivers/staging/qlge/
  
  QM1D1B0004 MEDIA DRIVER
  M:    Akihiro Tsukada <[email protected]>
@@@ -15637,8 -15628,8 +15631,8 @@@ F:   Documentation/s390/pci.rs
  
  S390 VFIO AP DRIVER
  M:    Tony Krowiak <[email protected]>
- M:    Pierre Morel <[email protected]>
  M:    Halil Pasic <[email protected]>
+ M:    Jason Herne <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -15650,6 -15641,7 +15644,7 @@@ F:   drivers/s390/crypto/vfio_ap_private.
  S390 VFIO-CCW DRIVER
  M:    Cornelia Huck <[email protected]>
  M:    Eric Farman <[email protected]>
+ M:    Matthew Rosato <[email protected]>
  R:    Halil Pasic <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15660,6 -15652,7 +15655,7 @@@ F:   include/uapi/linux/vfio_ccw.
  
  S390 VFIO-PCI DRIVER
  M:    Matthew Rosato <[email protected]>
+ M:    Eric Farman <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -16889,8 -16882,10 +16885,10 @@@ F: tools/spi
  
  SPIDERNET NETWORK DRIVER for CELL
  M:    Ishizaki Kou <[email protected]>
+ M:    Geoff Levand <[email protected]>
  L:    [email protected]
- S:    Supported
+ L:    [email protected]
+ S:    Maintained
  F:    Documentation/networking/device_drivers/ethernet/toshiba/spider_net.rst
  F:    drivers/net/ethernet/toshiba/spider_net*
  
@@@ -16944,7 -16939,8 +16942,8 @@@ F:   Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/st-mipid02.c
  
  ST STM32 I2C/SMBUS DRIVER
- M:    Pierre-Yves MORDRET <[email protected]>
+ M:    Pierre-Yves MORDRET <[email protected]>
+ M:    Alain Volmat <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-stm32*
@@@ -17069,7 -17065,7 +17068,7 @@@ F:   kernel/jump_label.
  F:    kernel/static_call.c
  
  STI AUDIO (ASoC) DRIVERS
- M:    Arnaud Pouliquen <[email protected]>
+ M:    Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
@@@ -17089,15 -17085,15 +17088,15 @@@ T:        git git://linuxtv.org/media_tree.gi
  F:    drivers/media/usb/stk1160/
  
  STM32 AUDIO (ASoC) DRIVERS
- M:    Olivier Moysan <[email protected]>
- M:    Arnaud Pouliquen <[email protected]>
+ M:    Olivier Moysan <olivier.moysan@foss.st.com>
+ M:    Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
  F:    sound/soc/stm/
  
  STM32 TIMER/LPTIMER DRIVERS
- M:    Fabrice Gasnier <[email protected]>
+ M:    Fabrice Gasnier <fabrice.gasnier@foss.st.com>
  S:    Maintained
  F:    Documentation/ABI/testing/*timer-stm32
  F:    Documentation/devicetree/bindings/*/*stm32-*timer*
@@@ -17107,7 -17103,7 +17106,7 @@@ F:   include/linux/*/stm32-*tim
  
  STMMAC ETHERNET DRIVER
  M:    Giuseppe Cavallaro <[email protected]>
- M:    Alexandre Torgue <[email protected]>
+ M:    Alexandre Torgue <alexandre.torgue@foss.st.com>
  M:    Jose Abreu <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -17831,13 -17827,6 +17830,13 @@@ M: Robert Richter <[email protected]
  S:    Odd Fixes
  F:    drivers/gpio/gpio-thunderx.c
  
 +TI ADS131E0X ADC SERIES DRIVER
 +M:    Tomislav Denis <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/adc/ti,ads131e08.yaml
 +F:    drivers/iio/adc/ti-ads131e08.c
 +
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
@@@ -17856,7 -17845,6 +17855,6 @@@ S:   Maintaine
  F:    drivers/thermal/ti-soc-thermal/
  
  TI BQ27XXX POWER SUPPLY DRIVER
- R:    Dan Murphy <[email protected]>
  F:    drivers/power/supply/bq27xxx_battery.c
  F:    drivers/power/supply/bq27xxx_battery_i2c.c
  F:    include/linux/power/bq27xxx_battery.h
@@@ -17991,7 -17979,6 +17989,6 @@@ S:   Odd Fixe
  F:    sound/soc/codecs/tas571x*
  
  TI TCAN4X5X DEVICE DRIVER
- M:    Dan Murphy <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/tcan4x5x.txt
index 8415f26fd4c0f7f65054633d92487075addaed33,15bbb63ca130ad43657e11278149e8a6ae508df1..6e48b31a9afc749513181a6d234c8a259f60c5a1
@@@ -449,9 -449,9 +449,9 @@@ drop
  static bool AddReorderEntry(struct rx_ts_record *pTS,
                            struct rx_reorder_entry *pReorderEntry)
  {
 -      struct list_head *pList = &pTS->RxPendingPktList;
 +      struct list_head *pList = &pTS->rx_pending_pkt_list;
  
 -      while (pList->next != &pTS->RxPendingPktList) {
 +      while (pList->next != &pTS->rx_pending_pkt_list) {
                if (SN_LESS(pReorderEntry->SeqNum, ((struct rx_reorder_entry *)
                    list_entry(pList->next, struct rx_reorder_entry,
                    List))->SeqNum))
@@@ -536,8 -536,8 +536,8 @@@ void rtllib_FlushRxTsPendingPkts(struc
        struct rx_reorder_entry *pRxReorderEntry;
        u8 RfdCnt = 0;
  
 -      del_timer_sync(&pTS->RxPktPendingTimer);
 -      while (!list_empty(&pTS->RxPendingPktList)) {
 +      del_timer_sync(&pTS->rx_pkt_pending_timer);
 +      while (!list_empty(&pTS->rx_pending_pkt_list)) {
                if (RfdCnt >= REORDER_WIN_SIZE) {
                        netdev_info(ieee->dev,
                                    "-------------->%s() error! RfdCnt >= REORDER_WIN_SIZE\n",
                }
  
                pRxReorderEntry = (struct rx_reorder_entry *)
 -                                list_entry(pTS->RxPendingPktList.prev,
 +                                list_entry(pTS->rx_pending_pkt_list.prev,
                                             struct rx_reorder_entry, List);
                netdev_dbg(ieee->dev, "%s(): Indicate SeqNum %d!\n", __func__,
                           pRxReorderEntry->SeqNum);
        }
        rtllib_indicate_packets(ieee, ieee->RfdArray, RfdCnt);
  
 -      pTS->RxIndicateSeq = 0xffff;
 +      pTS->rx_indicate_seq = 0xffff;
  }
  
  static void RxReorderIndicatePacket(struct rtllib_device *ieee,
        unsigned long flags;
  
        netdev_dbg(ieee->dev,
 -                 "%s(): Seq is %d, pTS->RxIndicateSeq is %d, WinSize is %d\n",
 -                 __func__, SeqNum, pTS->RxIndicateSeq, WinSize);
 +                 "%s(): Seq is %d, pTS->rx_indicate_seq is %d, WinSize is %d\n",
 +                 __func__, SeqNum, pTS->rx_indicate_seq, WinSize);
  
        spin_lock_irqsave(&(ieee->reorder_spinlock), flags);
  
 -      WinEnd = (pTS->RxIndicateSeq + WinSize - 1) % 4096;
 +      WinEnd = (pTS->rx_indicate_seq + WinSize - 1) % 4096;
        /* Rx Reorder initialize condition.*/
 -      if (pTS->RxIndicateSeq == 0xffff)
 -              pTS->RxIndicateSeq = SeqNum;
 +      if (pTS->rx_indicate_seq == 0xffff)
 +              pTS->rx_indicate_seq = SeqNum;
  
        /* Drop out the packet which SeqNum is smaller than WinStart */
 -      if (SN_LESS(SeqNum, pTS->RxIndicateSeq)) {
 +      if (SN_LESS(SeqNum, pTS->rx_indicate_seq)) {
                netdev_dbg(ieee->dev,
                           "Packet Drop! IndicateSeq: %d, NewSeq: %d\n",
 -                         pTS->RxIndicateSeq, SeqNum);
 +                         pTS->rx_indicate_seq, SeqNum);
                pHTInfo->RxReorderDropCounter++;
                {
                        int i;
         * 1. Incoming SeqNum is equal to WinStart =>Window shift 1
         * 2. Incoming SeqNum is larger than the WinEnd => Window shift N
         */
 -      if (SN_EQUAL(SeqNum, pTS->RxIndicateSeq)) {
 -              pTS->RxIndicateSeq = (pTS->RxIndicateSeq + 1) % 4096;
 +      if (SN_EQUAL(SeqNum, pTS->rx_indicate_seq)) {
 +              pTS->rx_indicate_seq = (pTS->rx_indicate_seq + 1) % 4096;
                bMatchWinStart = true;
        } else if (SN_LESS(WinEnd, SeqNum)) {
                if (SeqNum >= (WinSize - 1))
 -                      pTS->RxIndicateSeq = SeqNum + 1 - WinSize;
 +                      pTS->rx_indicate_seq = SeqNum + 1 - WinSize;
                else
 -                      pTS->RxIndicateSeq = 4095 -
 +                      pTS->rx_indicate_seq = 4095 -
                                             (WinSize - (SeqNum + 1)) + 1;
                netdev_dbg(ieee->dev,
                           "Window Shift! IndicateSeq: %d, NewSeq: %d\n",
 -                         pTS->RxIndicateSeq, SeqNum);
 +                         pTS->rx_indicate_seq, SeqNum);
        }
  
        /* Indication process.
                /* Current packet is going to be indicated.*/
                netdev_dbg(ieee->dev,
                           "Packets indication! IndicateSeq: %d, NewSeq: %d\n",
 -                         pTS->RxIndicateSeq, SeqNum);
 +                         pTS->rx_indicate_seq, SeqNum);
                ieee->prxbIndicateArray[0] = prxb;
                index = 1;
        } else {
  
                                netdev_dbg(ieee->dev,
                                           "%s(): Duplicate packet is dropped. IndicateSeq: %d, NewSeq: %d\n",
 -                                         __func__, pTS->RxIndicateSeq,
 +                                         __func__, pTS->rx_indicate_seq,
                                           SeqNum);
                                list_add_tail(&pReorderEntry->List,
                                              &ieee->RxReorder_Unused_List);
                        } else {
                                netdev_dbg(ieee->dev,
                                           "Pkt insert into struct buffer. IndicateSeq: %d, NewSeq: %d\n",
 -                                         pTS->RxIndicateSeq, SeqNum);
 +                                         pTS->rx_indicate_seq, SeqNum);
                        }
                } else {
                        /* Packets are dropped if there are not enough reorder
        }
  
        /* Check if there is any packet need indicate.*/
 -      while (!list_empty(&pTS->RxPendingPktList)) {
 +      while (!list_empty(&pTS->rx_pending_pkt_list)) {
                netdev_dbg(ieee->dev, "%s(): start RREORDER indicate\n",
                           __func__);
  
                pReorderEntry = (struct rx_reorder_entry *)
 -                                      list_entry(pTS->RxPendingPktList.prev,
 +                                      list_entry(pTS->rx_pending_pkt_list.prev,
                                                   struct rx_reorder_entry,
                                                   List);
 -              if (SN_LESS(pReorderEntry->SeqNum, pTS->RxIndicateSeq) ||
 -                  SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq)) {
 +              if (SN_LESS(pReorderEntry->SeqNum, pTS->rx_indicate_seq) ||
 +                  SN_EQUAL(pReorderEntry->SeqNum, pTS->rx_indicate_seq)) {
                        /* This protect struct buffer from overflow. */
                        if (index >= REORDER_WIN_SIZE) {
                                netdev_err(ieee->dev,
  
                        list_del_init(&pReorderEntry->List);
  
 -                      if (SN_EQUAL(pReorderEntry->SeqNum, pTS->RxIndicateSeq))
 -                              pTS->RxIndicateSeq = (pTS->RxIndicateSeq + 1) %
 +                      if (SN_EQUAL(pReorderEntry->SeqNum, pTS->rx_indicate_seq))
 +                              pTS->rx_indicate_seq = (pTS->rx_indicate_seq + 1) %
                                                     4096;
  
                        ieee->prxbIndicateArray[index] = pReorderEntry->prxb;
         * Rx buffering.
         */
        if (index > 0) {
 -              if (timer_pending(&pTS->RxPktPendingTimer))
 -                      del_timer_sync(&pTS->RxPktPendingTimer);
 -              pTS->RxTimeoutIndicateSeq = 0xffff;
 +              if (timer_pending(&pTS->rx_pkt_pending_timer))
 +                      del_timer_sync(&pTS->rx_pkt_pending_timer);
 +              pTS->rx_timeout_indicate_seq = 0xffff;
  
                if (index > REORDER_WIN_SIZE) {
                        netdev_err(ieee->dev,
                bPktInBuf = false;
        }
  
 -      if (bPktInBuf && pTS->RxTimeoutIndicateSeq == 0xffff) {
 +      if (bPktInBuf && pTS->rx_timeout_indicate_seq == 0xffff) {
                netdev_dbg(ieee->dev, "%s(): SET rx timeout timer\n", __func__);
 -              pTS->RxTimeoutIndicateSeq = pTS->RxIndicateSeq;
 -              mod_timer(&pTS->RxPktPendingTimer, jiffies +
 +              pTS->rx_timeout_indicate_seq = pTS->rx_indicate_seq;
 +              mod_timer(&pTS->rx_pkt_pending_timer, jiffies +
                          msecs_to_jiffies(pHTInfo->RxReorderPendingTime));
        }
        spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags);
@@@ -938,11 -938,11 +938,11 @@@ static int rtllib_rx_check_duplicate(st
  
                if (GetTs(ieee, (struct ts_common_info **) &pRxTS, hdr->addr2,
                        (u8)Frame_QoSTID((u8 *)(skb->data)), RX_DIR, true)) {
 -                      if ((fc & (1<<11)) && (frag == pRxTS->RxLastFragNum) &&
 -                          (WLAN_GET_SEQ_SEQ(sc) == pRxTS->RxLastSeqNum))
 +                      if ((fc & (1<<11)) && (frag == pRxTS->rx_last_frag_num) &&
 +                          (WLAN_GET_SEQ_SEQ(sc) == pRxTS->rx_last_seq_num))
                                return -1;
 -                      pRxTS->RxLastFragNum = frag;
 -                      pRxTS->RxLastSeqNum = WLAN_GET_SEQ_SEQ(sc);
 +                      pRxTS->rx_last_frag_num = frag;
 +                      pRxTS->rx_last_seq_num = WLAN_GET_SEQ_SEQ(sc);
                } else {
                        netdev_warn(ieee->dev, "%s(): No TS! Skip the check!\n",
                                    __func__);
@@@ -1850,20 -1850,19 +1850,20 @@@ static void rtllib_parse_mife_generic(s
                        *tmp_htcap_len = min_t(u8, info_element->len,
                                               MAX_IE_LEN);
                        if (*tmp_htcap_len != 0) {
 -                              network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;
 -                              network->bssht.bdHTCapLen = min_t(u16, *tmp_htcap_len, sizeof(network->bssht.bdHTCapBuf));
 -                              memcpy(network->bssht.bdHTCapBuf,
 +                              network->bssht.bd_ht_spec_ver = HT_SPEC_VER_EWC;
 +                              network->bssht.bd_ht_cap_len = min_t(u16, *tmp_htcap_len,
 +                                                                sizeof(network->bssht.bd_ht_cap_buf));
 +                              memcpy(network->bssht.bd_ht_cap_buf,
                                       info_element->data,
 -                                     network->bssht.bdHTCapLen);
 +                                     network->bssht.bd_ht_cap_len);
                        }
                }
                if (*tmp_htcap_len != 0) {
 -                      network->bssht.bdSupportHT = true;
 -                      network->bssht.bdHT1R = ((((struct ht_capab_ele *)(network->bssht.bdHTCapBuf))->MCS[1]) == 0);
 +                      network->bssht.bd_support_ht = true;
 +                      network->bssht.bd_ht_1r = ((((struct ht_capab_ele *)(network->bssht.bd_ht_cap_buf))->MCS[1]) == 0);
                } else {
 -                      network->bssht.bdSupportHT = false;
 -                      network->bssht.bdHT1R = false;
 +                      network->bssht.bd_support_ht = false;
 +                      network->bssht.bd_ht_1r = false;
                }
        }
  
                        *tmp_htinfo_len = min_t(u8, info_element->len,
                                                MAX_IE_LEN);
                        if (*tmp_htinfo_len != 0) {
 -                              network->bssht.bdHTSpecVer = HT_SPEC_VER_EWC;
 -                              network->bssht.bdHTInfoLen = min_t(u16, *tmp_htinfo_len, sizeof(network->bssht.bdHTInfoBuf));
 -                              memcpy(network->bssht.bdHTInfoBuf,
 +                              network->bssht.bd_ht_spec_ver = HT_SPEC_VER_EWC;
 +                              network->bssht.bd_ht_info_len = min_t(u16, *tmp_htinfo_len,
 +                                                                    sizeof(network->bssht.bd_ht_info_buf));
 +                              memcpy(network->bssht.bd_ht_info_buf,
                                       info_element->data,
 -                                     network->bssht.bdHTInfoLen);
 +                                     network->bssht.bd_ht_info_len);
                        }
                }
        }
  
 -      if (network->bssht.bdSupportHT) {
 +      if (network->bssht.bd_support_ht) {
                if (info_element->len >= 4 &&
                    info_element->data[0] == 0x00 &&
                    info_element->data[1] == 0xe0 &&
                }
                if (ht_realtek_agg_len >= 5) {
                        network->realtek_cap_exit = true;
 -                      network->bssht.bdRT2RTAggregation = true;
 +                      network->bssht.bd_rt2rt_aggregation = true;
  
                        if ((ht_realtek_agg_buf[4] == 1) &&
                            (ht_realtek_agg_buf[5] & 0x02))
 -                              network->bssht.bdRT2RTLongSlotTime = true;
 +                              network->bssht.bd_rt2rt_long_slot_time = true;
  
                        if ((ht_realtek_agg_buf[4] == 1) &&
                            (ht_realtek_agg_buf[5] & RT_HT_CAP_USE_92SE))
 -                              network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_92SE;
 +                              network->bssht.rt2rt_ht_mode |= RT_HT_CAP_USE_92SE;
                }
        }
        if (ht_realtek_agg_len >= 5) {
                if ((ht_realtek_agg_buf[5] & RT_HT_CAP_USE_SOFTAP))
 -                      network->bssht.RT2RT_HT_Mode |= RT_HT_CAP_USE_SOFTAP;
 +                      network->bssht.rt2rt_ht_mode |= RT_HT_CAP_USE_SOFTAP;
        }
  
        if ((info_element->len >= 3 &&
            info_element->data[2] == 0x96 &&
            info_element->data[3] == 0x01) {
                if (info_element->len == 6) {
-                       memcpy(network->CcxRmState, &info_element[4], 2);
+                       memcpy(network->CcxRmState, &info_element->data[4], 2);
                        if (network->CcxRmState[0] != 0)
                                network->bCcxRmEnable = true;
                        else
@@@ -2022,22 -2020,22 +2022,22 @@@ static void rtllib_parse_mfie_ht_cap(st
  
        *tmp_htcap_len = min_t(u8, info_element->len, MAX_IE_LEN);
        if (*tmp_htcap_len != 0) {
 -              ht->bdHTSpecVer = HT_SPEC_VER_EWC;
 -              ht->bdHTCapLen = min_t(u16, *tmp_htcap_len,
 -                                     sizeof(ht->bdHTCapBuf));
 -              memcpy(ht->bdHTCapBuf, info_element->data, ht->bdHTCapLen);
 +              ht->bd_ht_spec_ver = HT_SPEC_VER_EWC;
 +              ht->bd_ht_cap_len = min_t(u16, *tmp_htcap_len,
 +                                     sizeof(ht->bd_ht_cap_buf));
 +              memcpy(ht->bd_ht_cap_buf, info_element->data, ht->bd_ht_cap_len);
  
 -              ht->bdSupportHT = true;
 -              ht->bdHT1R = ((((struct ht_capab_ele *)
 -                              ht->bdHTCapBuf))->MCS[1]) == 0;
 +              ht->bd_support_ht = true;
 +              ht->bd_ht_1r = ((((struct ht_capab_ele *)
 +                              ht->bd_ht_cap_buf))->MCS[1]) == 0;
  
 -              ht->bdBandWidth = (enum ht_channel_width)
 +              ht->bd_bandwidth = (enum ht_channel_width)
                                             (((struct ht_capab_ele *)
 -                                           (ht->bdHTCapBuf))->ChlWidth);
 +                                           (ht->bd_ht_cap_buf))->ChlWidth);
        } else {
 -              ht->bdSupportHT = false;
 -              ht->bdHT1R = false;
 -              ht->bdBandWidth = HT_CHANNEL_WIDTH_20;
 +              ht->bd_support_ht = false;
 +              ht->bd_ht_1r = false;
 +              ht->bd_bandwidth = HT_CHANNEL_WIDTH_20;
        }
  }
  
@@@ -2234,14 -2232,14 +2234,14 @@@ int rtllib_parse_info_param(struct rtll
                        tmp_htinfo_len = min_t(u8, info_element->len,
                                               MAX_IE_LEN);
                        if (tmp_htinfo_len) {
 -                              network->bssht.bdHTSpecVer = HT_SPEC_VER_IEEE;
 -                              network->bssht.bdHTInfoLen = tmp_htinfo_len >
 -                                      sizeof(network->bssht.bdHTInfoBuf) ?
 -                                      sizeof(network->bssht.bdHTInfoBuf) :
 +                              network->bssht.bd_ht_spec_ver = HT_SPEC_VER_IEEE;
 +                              network->bssht.bd_ht_info_len = tmp_htinfo_len >
 +                                      sizeof(network->bssht.bd_ht_info_buf) ?
 +                                      sizeof(network->bssht.bd_ht_info_buf) :
                                        tmp_htinfo_len;
 -                              memcpy(network->bssht.bdHTInfoBuf,
 +                              memcpy(network->bssht.bd_ht_info_buf,
                                       info_element->data,
 -                                     network->bssht.bdHTInfoLen);
 +                                     network->bssht.bd_ht_info_len);
                        }
                        break;
  
  
        if (!network->atheros_cap_exist && !network->broadcom_cap_exist &&
            !network->cisco_cap_exist && !network->ralink_cap_exist &&
 -          !network->bssht.bdRT2RTAggregation)
 +          !network->bssht.bd_rt2rt_aggregation)
                network->unknown_cap_exist = true;
        else
                network->unknown_cap_exist = false;
@@@ -2382,7 -2380,7 +2382,7 @@@ static inline int rtllib_network_init
                return 1;
        }
  
 -      if (network->bssht.bdSupportHT) {
 +      if (network->bssht.bd_support_ht) {
                if (network->mode == IEEE_A)
                        network->mode = IEEE_N_5G;
                else if (network->mode & (IEEE_G | IEEE_B))
@@@ -2458,16 -2456,16 +2458,16 @@@ static inline void update_network(struc
        dst->last_dtim_sta_time = src->last_dtim_sta_time;
        memcpy(&dst->tim, &src->tim, sizeof(struct rtllib_tim_parameters));
  
 -      dst->bssht.bdSupportHT = src->bssht.bdSupportHT;
 -      dst->bssht.bdRT2RTAggregation = src->bssht.bdRT2RTAggregation;
 -      dst->bssht.bdHTCapLen = src->bssht.bdHTCapLen;
 -      memcpy(dst->bssht.bdHTCapBuf, src->bssht.bdHTCapBuf,
 -             src->bssht.bdHTCapLen);
 -      dst->bssht.bdHTInfoLen = src->bssht.bdHTInfoLen;
 -      memcpy(dst->bssht.bdHTInfoBuf, src->bssht.bdHTInfoBuf,
 -             src->bssht.bdHTInfoLen);
 -      dst->bssht.bdHTSpecVer = src->bssht.bdHTSpecVer;
 -      dst->bssht.bdRT2RTLongSlotTime = src->bssht.bdRT2RTLongSlotTime;
 +      dst->bssht.bd_support_ht = src->bssht.bd_support_ht;
 +      dst->bssht.bd_rt2rt_aggregation = src->bssht.bd_rt2rt_aggregation;
 +      dst->bssht.bd_ht_cap_len = src->bssht.bd_ht_cap_len;
 +      memcpy(dst->bssht.bd_ht_cap_buf, src->bssht.bd_ht_cap_buf,
 +             src->bssht.bd_ht_cap_len);
 +      dst->bssht.bd_ht_info_len = src->bssht.bd_ht_info_len;
 +      memcpy(dst->bssht.bd_ht_info_buf, src->bssht.bd_ht_info_buf,
 +             src->bssht.bd_ht_info_len);
 +      dst->bssht.bd_ht_spec_ver = src->bssht.bd_ht_spec_ver;
 +      dst->bssht.bd_rt2rt_long_slot_time = src->bssht.bd_rt2rt_long_slot_time;
        dst->broadcom_cap_exist = src->broadcom_cap_exist;
        dst->ralink_cap_exist = src->ralink_cap_exist;
        dst->atheros_cap_exist = src->atheros_cap_exist;
This page took 0.197545 seconds and 4 git commands to generate.