Skip to content

Commit beec421

Browse files
TheScarasticTheScarastic
committed
"LA.UM.6.6.r1-09000-89xx.0" * tag 'LA.UM.6.6.r1-09000-89xx.0' of https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/prima: (107 commits) wlan: Update needed_headroom with LIBRA_HW_NEEDED_HEADROOM wlan: Advertize flag WIPHY_WOWLAN_ANY in wiphy wowlan config wlan: Don't access adapter after netdev is freed wlan: Fix frame lenth information to cfg80211 wlan: Use proper length to send the beacon/probe to kernel wlan: Resolve memory leak while processing SET_PACKET_FILTER IOCTL wlan: Initialize channel switch completion variable during SAP OPEN wlan: NULL pointer access in wlan_hdd_free_cache_channels wlan: Abort ongoing scan on disable agg indication wlan: Reject invalid subsequent set disable channel command wlan: Use max tx power allowed to compute link report power Wlan: Do not flush disconnect command from sme on receiving connect wlan: Use request manager while processing driver commands wlan: Revert "wlan: Use request manager for GETFWSTATS and GETBCNMISSRATE" wlan: While processing get current antenna request wait for the WDA response wlan: Use request manager while processing monitor mode start/stop request wlan: Add support to dynamically configure BTC and Concurrent dwell time wlan: Correctly report 20 MHz bandwidth in Linux 4.x wlan: Increase MAX_CFG_INI_ITEMS to 1024 wlan: Do not start auto bmps timer when aggregation is disabled ... Change-Id: Ifacb8caabd0aaf1a677378dcc70ebee52839039e
2 parents b7071e6 + cc44d1b commit beec421

76 files changed

Lines changed: 4869 additions & 1703 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎drivers/staging/prima/CORE/DXE/src/wlan_qct_dxe.c‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
2+
* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
33
*
44
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
55
*
@@ -64,6 +64,7 @@ when who what, where, why
6464
#include "wlan_qct_dxe.h"
6565
#include "wlan_qct_dxe_i.h"
6666
#include "wlan_qct_pal_device.h"
67+
#include "vos_api.h"
6768

6869
/*----------------------------------------------------------------------------
6970
* Local Definitions
@@ -1714,7 +1715,7 @@ void dxeRXResourceAvailableTimerExpHandler
17141715
if (NULL != dxeCtxt)
17151716
dxeCtxt->driverReloadInProcessing = eWLAN_PAL_TRUE;
17161717

1717-
wpalWlanReload();
1718+
wpalWlanReload(VOS_DXE_FAILURE);
17181719

17191720
if (NULL != usrData)
17201721
dxeStartSSRTimer((WLANDXE_CtrlBlkType *)usrData);
@@ -2414,7 +2415,7 @@ static wpt_status dxeRXFrameReady
24142415
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
24152416
"RX successive empty interrupt, Could not find invalidated DESC reload driver");
24162417
dxeCtxt->driverReloadInProcessing = eWLAN_PAL_TRUE;
2417-
wpalWlanReload();
2418+
wpalWlanReload(VOS_DXE_FAILURE);
24182419
dxeStartSSRTimer(dxeCtxt);
24192420
}
24202421
}
@@ -2743,7 +2744,7 @@ void dxeRXEventHandler
27432744
if (eWLAN_PAL_STATUS_SUCCESS != dxeErrHandler(channelCb, chHighStat))
27442745
{
27452746
dxeCtxt->driverReloadInProcessing = eWLAN_PAL_TRUE;
2746-
wpalWlanReload();
2747+
wpalWlanReload(VOS_DXE_FAILURE);
27472748
dxeStartSSRTimer(dxeCtxt);
27482749
}
27492750
}
@@ -2798,7 +2799,7 @@ void dxeRXEventHandler
27982799
dxeErrHandler(channelCb, chLowStat))
27992800
{
28002801
dxeCtxt->driverReloadInProcessing = eWLAN_PAL_TRUE;
2801-
wpalWlanReload();
2802+
wpalWlanReload(VOS_DXE_FAILURE);
28022803
dxeStartSSRTimer(dxeCtxt);
28032804
}
28042805
}
@@ -2850,7 +2851,7 @@ void dxeRXEventHandler
28502851
dxeErrHandler(channelCb, chLogRxStat))
28512852
{
28522853
dxeCtxt->driverReloadInProcessing = eWLAN_PAL_TRUE;
2853-
wpalWlanReload();
2854+
wpalWlanReload(VOS_DXE_FAILURE);
28542855
dxeStartSSRTimer(dxeCtxt);
28552856
}
28562857

@@ -2904,7 +2905,7 @@ void dxeRXEventHandler
29042905
dxeErrHandler(channelCb, chLogRxFwStat))
29052906
{
29062907
dxeCtxt->driverReloadInProcessing = eWLAN_PAL_TRUE;
2907-
wpalWlanReload();
2908+
wpalWlanReload(VOS_DXE_FAILURE);
29082909
dxeStartSSRTimer(dxeCtxt);
29092910
}
29102911

@@ -3447,7 +3448,7 @@ static wpt_status dxeTXPushFrame
34473448

34483449
if(wpalIsArpPkt(palPacket))
34493450
{
3450-
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
3451+
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_HIGH,
34513452
"%s :ARP packet", __func__);
34523453
}
34533454

@@ -3704,7 +3705,7 @@ static wpt_status dxeTXCompFrame
37043705

37053706
if(wpalIsArpPkt(currentCtrlBlk->xfrFrame))
37063707
{
3707-
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
3708+
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_INFO_HIGH,
37083709
"%s :ARP packet DMA-ed ", __func__);
37093710
wpalUpdateTXArpFWdeliveredStats();
37103711
}
@@ -4102,7 +4103,7 @@ void dxeTXEventHandler
41024103
dxeErrHandler(channelCb, chStat))
41034104
{
41044105
dxeCtxt->driverReloadInProcessing = eWLAN_PAL_TRUE;
4105-
wpalWlanReload();
4106+
wpalWlanReload(VOS_DXE_FAILURE);
41064107
dxeStartSSRTimer(dxeCtxt);
41074108
}
41084109
bEnableISR = 1;
@@ -4159,7 +4160,7 @@ void dxeTXEventHandler
41594160
dxeErrHandler(channelCb, chStat))
41604161
{
41614162
dxeCtxt->driverReloadInProcessing = eWLAN_PAL_TRUE;
4162-
wpalWlanReload();
4163+
wpalWlanReload(VOS_DXE_FAILURE);
41634164
dxeStartSSRTimer(dxeCtxt);
41644165
}
41654166
bEnableISR = 1;

‎drivers/staging/prima/CORE/HDD/inc/wlan_hdd_cfg.h‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#endif /* DHCP_SERVER_OFFLOAD */
5555

5656
//Number of items that can be configured
57-
#define MAX_CFG_INI_ITEMS 512
57+
#define MAX_CFG_INI_ITEMS 1024
5858

5959
#ifdef SAP_AUTH_OFFLOAD
6060
/* 802.11 pre-share key length */
@@ -1190,6 +1190,11 @@ typedef enum
11901190
#define CFG_REORDER_TIME_VO_MAX 1000
11911191
#define CFG_REORDER_TIME_VO_DEFAULT 40
11921192

1193+
#define CFG_ENABLE_PN_REPLAY_NAME "PNreplayCheck"
1194+
#define CFG_ENABLE_PN_REPLAY_MIN 0
1195+
#define CFG_ENABLE_PN_REPLAY_MAX 1
1196+
#define CFG_ENABLE_PN_REPLAY_DEFAULT 0
1197+
11931198
#if defined WLAN_FEATURE_VOWIFI
11941199
#define CFG_RRM_ENABLE_NAME "gRrmEnable"
11951200
#define CFG_RRM_ENABLE_MIN (0)
@@ -1743,6 +1748,26 @@ typedef enum
17431748
#define CFG_ENABLE_TCP_DELACK_MAX (1)
17441749
#define CFG_ENABLE_TCP_DELACK_DEFAULT (1)
17451750

1751+
#define CFG_BTC_2M_DYN_LONG_WLAN_LEN_NAME "gBTC2MDynLongWLAN"
1752+
#define CFG_BTC_2M_DYN_LONG_WLAN_LEN_MIN (15000)
1753+
#define CFG_BTC_2M_DYN_LONG_WLAN_LEN_MAX (55000)
1754+
#define CFG_BTC_2M_DYN_LONG_WLAN_LEN_DEFAULT (35000)
1755+
1756+
#define CFG_BTC_2M_DYN_LONG_BT_LEN_NAME "gBTC2MDynLongBT"
1757+
#define CFG_BTC_2M_DYN_LONG_BT_LEN_MIN (15000)
1758+
#define CFG_BTC_2M_DYN_LONG_BT_LEN_MAX (25000)
1759+
#define CFG_BTC_2M_DYN_LONG_BT_LEN_DEFAULT (25000)
1760+
1761+
#define CFG_BTC_2M_DYN_LONG_BT_EXT_LEN_NAME "gBTC2MDynLongBTExt"
1762+
#define CFG_BTC_2M_DYN_LONG_BT_EXT_LEN_MIN (5000)
1763+
#define CFG_BTC_2M_DYN_LONG_BT_EXT_LEN_MAX (15000)
1764+
#define CFG_BTC_2M_DYN_LONG_BT_EXT_LEN_DEFAULT (15000)
1765+
1766+
#define CFG_BTC_2M_DYN_LONG_NUM_BT_EXT_NAME "gBTC2MDynLongNumBTExt"
1767+
#define CFG_BTC_2M_DYN_LONG_NUM_BT_EXT_MIN (5)
1768+
#define CFG_BTC_2M_DYN_LONG_NUM_BT_EXT_MAX (15)
1769+
#define CFG_BTC_2M_DYN_LONG_NUM_BT_EXT_DEFAULT (15)
1770+
17461771
#ifdef SAP_AUTH_OFFLOAD
17471772
/* Enable/Disable SAP Authentication offload
17481773
* Default: enable
@@ -3178,6 +3203,8 @@ This feature requires the dependent cfg.ini "gRoamPrefer5GHz" set to 1 */
31783203
#define CFG_ENABLE_POWERSAVE_OFFLOAD_MAX (2)
31793204
#define CFG_ENABLE_POWERSAVE_OFFLOAD_DEFAULT (1)
31803205

3206+
3207+
31813208
/*---------------------------------------------------------------------------
31823209
Type declarations
31833210
-------------------------------------------------------------------------*/
@@ -3456,6 +3483,7 @@ typedef struct
34563483
v_U16_t BeReorderAgingTime;
34573484
v_U16_t ViReorderAgingTime;
34583485
v_U16_t VoReorderAgingTime;
3486+
v_BOOL_t enablePNReplay;
34593487

34603488
/* Wowl pattern */
34613489
char wowlPattern[1024];
@@ -3787,6 +3815,10 @@ typedef struct
37873815
/* control marking indoor channel passive to disable */
37883816
bool disable_indoor_channel;
37893817
uint32_t enable_power_save_offload;
3818+
uint32_t btc_dyn_wlan_len;
3819+
uint32_t btc_dyn_bt_len;
3820+
uint32_t btc_dyn_bt_ext_len;
3821+
uint32_t btc_dyn_num_bt_ext;
37903822

37913823
} hdd_config_t;
37923824

0 commit comments

Comments
 (0)