Revert all recent WLAN related changes

Just kidding, instability galore...

Signed-off-by: Nathan Chancellor <[email protected]>

arch/arm64/configs/flash-custom_defconfig

@@ -519,28 +519,31 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_QCA_CLD_WLAN=m
 CONFIG_QCACLD_WLAN_LFR3=y
-CONFIG_PRIMA_WLAN_OKC=y
-CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
+CONFIG_WLAN_FEATURE_FILS=y
 CONFIG_WLAN_FEATURE_11W=y
 CONFIG_WLAN_FEATURE_LPSS=y
 CONFIG_QCOM_VOWIFI_11R=y
 CONFIG_QCACLD_FEATURE_NAN=y
 CONFIG_WLAN_FEATURE_NAN_DATAPATH=y
+CONFIG_QCACLD_FEATURE_GREEN_AP=y
+CONFIG_QCACLD_FEATURE_METERING=y
 CONFIG_HELIUMPLUS=y
 CONFIG_64BIT_PADDR=y
 CONFIG_QCOM_TDLS=y
 CONFIG_QCOM_LTE_COEX=y
 CONFIG_MPC_UT_FRAMEWORK=y
 CONFIG_WLAN_OFFLOAD_PACKETS=y
 CONFIG_FEATURE_TSO=y
-CONFIG_FEATURE_TSO_DEBUG=y
 CONFIG_WLAN_FASTPATH=y
 CONFIG_WLAN_NAPI=y
 CONFIG_WLAN_TX_FLOW_CONTROL_V2=y
 CONFIG_WLAN_SYNC_TSF=y
 CONFIG_LFR_SUBNET_DETECTION=y
 CONFIG_MCC_TO_SCC_SWITCH=y
 CONFIG_QCACLD_WLAN_LFR2=y
+CONFIG_WLAN_FEATURE_DISA=y
+CONFIG_WLAN_SPECTRAL_SCAN=y
+CONFIG_BUILD_TIMESTAMP=y
 CONFIG_QPNP_REVID=y
 CONFIG_QPNP_COINCELL=y
 CONFIG_SPS=y

arch/arm64/configs/flash-oos_defconfig

@@ -512,28 +512,31 @@ CONFIG_ION=y
 CONFIG_ION_MSM=y
 CONFIG_QCA_CLD_WLAN=m
 CONFIG_QCACLD_WLAN_LFR3=y
-CONFIG_PRIMA_WLAN_OKC=y
-CONFIG_PRIMA_WLAN_11AC_HIGH_TP=y
+CONFIG_WLAN_FEATURE_FILS=y
 CONFIG_WLAN_FEATURE_11W=y
 CONFIG_WLAN_FEATURE_LPSS=y
 CONFIG_QCOM_VOWIFI_11R=y
 CONFIG_QCACLD_FEATURE_NAN=y
 CONFIG_WLAN_FEATURE_NAN_DATAPATH=y
+CONFIG_QCACLD_FEATURE_GREEN_AP=y
+CONFIG_QCACLD_FEATURE_METERING=y
 CONFIG_HELIUMPLUS=y
 CONFIG_64BIT_PADDR=y
 CONFIG_QCOM_TDLS=y
 CONFIG_QCOM_LTE_COEX=y
 CONFIG_MPC_UT_FRAMEWORK=y
 CONFIG_WLAN_OFFLOAD_PACKETS=y
 CONFIG_FEATURE_TSO=y
-CONFIG_FEATURE_TSO_DEBUG=y
 CONFIG_WLAN_FASTPATH=y
 CONFIG_WLAN_NAPI=y
 CONFIG_WLAN_TX_FLOW_CONTROL_V2=y
 CONFIG_WLAN_SYNC_TSF=y
 CONFIG_LFR_SUBNET_DETECTION=y
 CONFIG_MCC_TO_SCC_SWITCH=y
 CONFIG_QCACLD_WLAN_LFR2=y
+CONFIG_WLAN_FEATURE_DISA=y
+CONFIG_WLAN_SPECTRAL_SCAN=y
+CONFIG_BUILD_TIMESTAMP=y
 CONFIG_QPNP_REVID=y
 CONFIG_QPNP_COINCELL=y
 CONFIG_SPS=y

drivers/staging/fw-api/fw/a_usb_defs.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -24,6 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
+
 /*
  *  Shared USB definitions
  *
@@ -46,6 +47,8 @@
 #define USB_EP_ADDR_APP_DATA2_IN         0x83
 #define USB_EP_ADDR_APP_INT_IN           0x84
 
+
+
 #define USB_EP_ADDR_APP_CTRL_OUT         0x01
 #define USB_EP_ADDR_APP_DATA_LP_OUT      0x02
 #define USB_EP_ADDR_APP_DATA_MP_OUT      0x03
@@ -56,35 +59,36 @@
 #define USB_CONTROL_REQ_DIAG_CMD            3
 #define USB_CONTROL_REQ_DIAG_RESP           4
 
-/* #define USB_CONTROL_MAX_BMI_TRANSFER_SIZE   64 */
+
+//#define USB_CONTROL_MAX_BMI_TRANSFER_SIZE   64
 #define USB_CONTROL_MAX_BMI_TRANSFER_SIZE   252
 
 #define HIF_BMI_MAX_TRANSFER_SIZE           USB_CONTROL_MAX_BMI_TRANSFER_SIZE
 
-/* 512 Bytes Maxp for High Speed for BULK EP */
-#define USB_HS_BULK_MAXP_SIZE   0x200
-/* 64 Bytes Maxp for Full Speed for BULK EP */
-#define USB_FS_BULK_MAXP_SIZE   0x40
+#define USB_HS_BULK_MAXP_SIZE   0x200  //512 Bytes Maxp for High Speed for BULK EP
+#define USB_FS_BULK_MAXP_SIZE   0x40   //64 Bytes Maxp for Full Speed for BULK EP
+
+
 
 /* diagnostic command defnitions */
 #define USB_CTRL_DIAG_CC_READ       0
 #define USB_CTRL_DIAG_CC_WRITE      1
 #define USB_CTRL_DIAG_CC_WARM_RESET 2
 
 typedef PREPACK struct {
-	A_UINT32 Cmd;
-	A_UINT32 Address;
-	A_UINT32 Value;
-	A_UINT32 _pad[1];
+    A_UINT32    Cmd;
+    A_UINT32    Address;
+    A_UINT32    Value;
+    A_UINT32    _pad[1];
 } POSTPACK USB_CTRL_DIAG_CMD_WRITE;
 
 typedef PREPACK struct {
-	A_UINT32 Cmd;
-	A_UINT32 Address;
+    A_UINT32    Cmd;
+    A_UINT32    Address;
 } POSTPACK USB_CTRL_DIAG_CMD_READ;
 
 typedef PREPACK struct {
-	A_UINT32 ReadValue;
+    A_UINT32    ReadValue;
 } POSTPACK USB_CTRL_DIAG_RESP_READ;
 
 #define USB_CTRL_MAX_DIAG_CMD_SIZE  (sizeof(USB_CTRL_DIAG_CMD_WRITE))

drivers/staging/fw-api/fw/athdefs.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -41,43 +41,50 @@
  */
 
 typedef enum {
-	A_ERROR = -1,           /* Generic error return */
-	A_OK = 0,               /* success */
-	/* Following values start at 1 */
-	A_DEVICE_NOT_FOUND,     /* not able to find PCI device */
-	A_NO_MEMORY,            /* not able to allocate memory, not available */
-	A_MEMORY_NOT_AVAIL,     /* memory region is not free for mapping */
-	A_NO_FREE_DESC,         /* no free descriptors available */
-	A_BAD_ADDRESS,          /* address does not match descriptor */
-	A_WIN_DRIVER_ERROR,     /* used in NT_HW version, if problem at init */
-	A_REGS_NOT_MAPPED,      /* registers not correctly mapped */
-	A_EPERM,                /* Not superuser */
-	A_EACCES,               /* Access denied */
-	A_ENOENT,               /* No such entry, search failed, etc. */
-	A_EEXIST,               /* The object already exists (can't create) */
-	A_EFAULT,               /* Bad address fault */
-	A_EBUSY,                /* Object is busy */
-	A_EINVAL,               /* Invalid parameter */
-	A_EMSGSIZE,             /* Inappropriate message buffer length */
-	A_ECANCELED,            /* Operation canceled */
-	A_ENOTSUP,              /* Operation not supported */
-	A_ECOMM,                /* Communication error on send */
-	A_EPROTO,               /* Protocol error */
-	A_ENODEV,               /* No such device */
-	A_EDEVNOTUP,            /* device is not UP */
-	A_NO_RESOURCE,          /* No resources for requested operation */
-	A_HARDWARE,             /* Hardware failure */
-	A_PENDING,              /* Asynchronous routine; will send up results la
-	                           ter (typically in callback) */
-	A_EBADCHANNEL,          /* The channel cannot be used */
-	A_DECRYPT_ERROR,        /* Decryption error */
-	A_PHY_ERROR,            /* RX PHY error */
-	A_CONSUMED,             /* Object was consumed */
-	A_CLONE,                /* The buffer is cloned */
-	A_USB_ERROR,            /* Rome USB Target error */
+    A_ERROR = -1,               /* Generic error return */
+    A_OK = 0,                   /* success */
+                                /* Following values start at 1 */
+    A_DEVICE_NOT_FOUND,         /* not able to find PCI device */
+    A_NO_MEMORY,                /* not able to allocate memory, not available */
+    A_MEMORY_NOT_AVAIL,         /* memory region is not free for mapping */
+    A_NO_FREE_DESC,             /* no free descriptors available */
+    A_BAD_ADDRESS,              /* address does not match descriptor */
+    A_WIN_DRIVER_ERROR,         /* used in NT_HW version, if problem at init */
+    A_REGS_NOT_MAPPED,          /* registers not correctly mapped */
+    A_EPERM,                    /* Not superuser */
+    A_EACCES,                   /* Access denied */
+    A_ENOENT,                   /* No such entry, search failed, etc. */
+    A_EEXIST,                   /* The object already exists (can't create) */
+    A_EFAULT,                   /* Bad address fault */
+    A_EBUSY,                    /* Object is busy */
+    A_EINVAL,                   /* Invalid parameter */
+    A_EMSGSIZE,                 /* Inappropriate message buffer length */
+    A_ECANCELED,                /* Operation canceled */
+    A_ENOTSUP,                  /* Operation not supported */
+    A_ECOMM,                    /* Communication error on send */
+    A_EPROTO,                   /* Protocol error */
+    A_ENODEV,                   /* No such device */
+    A_EDEVNOTUP,                /* device is not UP */
+    A_NO_RESOURCE,              /* No resources for requested operation */
+    A_HARDWARE,                 /* Hardware failure */
+    A_PENDING,                  /* Asynchronous routine; will send up results la
+ter (typically in callback) */
+    A_EBADCHANNEL,              /* The channel cannot be used */
+    A_DECRYPT_ERROR,            /* Decryption error */
+    A_PHY_ERROR,                /* RX PHY error */
+    A_CONSUMED,                 /* Object was consumed */
+    A_CLONE,                    /* The buffer is cloned */
 } A_STATUS;
 
 #define A_SUCCESS(x)        (x == A_OK)
 #define A_FAILED(x)         (!A_SUCCESS(x))
 
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
 #endif /* __ATHDEFS_H__ */

drivers/staging/fw-api/fw/bin_sig.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012,2014, 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -28,17 +28,16 @@
 #ifndef BIN_SIGN_H_
 #define BIN_SIGN_H_
 
-
 /* Signed binary MetaData */
 typedef struct {
-	unsigned int magic_num;
-	unsigned int total_len;
-	unsigned int rampatch_len;
-	unsigned int product_id;
-	unsigned int patch_ver;
-	unsigned short sign_format_ver;
-	unsigned short sign_algorithm;
-	unsigned char reserved[8];
+    unsigned int magic_num;
+    unsigned int total_len;
+    unsigned int rampatch_len;
+    unsigned int product_id;
+    unsigned int patch_ver;
+    unsigned short sign_format_ver;
+    unsigned short sign_algorithm;
+    unsigned char reserved[8];
 } SIGN_HEADER_T;
 
 #endif /*  BIN_SIGN_H_ */