Merge tag 'master-2014-10-02' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

John W. Linville says:

====================
pull request: wireless-next 2014-10-03

Please pull tihs batch of updates intended for the 3.18 stream!

For the iwlwifi bits, Emmanuel says:

"I have here a few things that depend on the latest mac80211's changes:
RRM, TPC, Quiet Period etc...  Eyal keeps improving our rate control
and we have a new device ID. This last patch should probably have
gone to wireless.git, but at that stage, I preferred to send it to
-next and CC stable."

For (most of) the Atheros bits, Kalle says:

"The only new feature is testmode support from me. Ben added a new method
to crash the firmware with an assert for debug purposes. As usual, we
have lots of smaller fixes from Michal. Matteo fixed a Kconfig
dependency with debugfs. I fixed some warnings recently added to
checkpatch."

For the NFC bits, Samuel says:

"We've had major updates for TI and ST Microelectronics drivers, and a
few NCI related changes.

For TI's trf7970a driver:

- Target mode support for trf7970a
- Suspend/resume support for trf7970a
- DT properties additions to handle different quirks
- A bunch of fixes for smartphone IOP related issues

For ST Microelectronics' ST21NFCA and ST21NFCB drivers:

- ISO15693 support for st21nfcb
- checkpatch and sparse related warning fixes
- Code cleanups and a few minor fixes

Finally, Marvell added ISO15693 support to the NCI stack, together with a
couple of NCI fixes."

For the Bluetooth bits, Johan says:

"This 3.18 pull request replaces the one I did on Monday ("bluetooth-next
2014-09-22", which hasn't been pulled yet). The additions since the last
request are:

 - SCO connection fix for devices not supporting eSCO
 - Cleanups regarding the SCO establishment logic
 - Remove unnecessary return value from logging functions
 - Header compression fix for 6lowpan
 - Cleanups to the ieee802154/mrf24j40 driver

Here's a copy from previous request that this one replaces:

'
Here are some more patches for 3.18. They include various fixes to the
btusb HCI driver, a fix for LE SMP, as well as adding Jukka to the
MAINTAINERS file for generic 6LoWPAN (as requested by Alexander Aring).

I've held on to this pull request a bit since we were waiting for a SCO
related fix to get sorted out first. However, since the merge window is
getting closer I decided not to wait for it. If we do get the fix sorted
out there'll probably be a second small pull request later this week.
'"

And,

"Unless 3.17 gets delayed this will probably be our last -next pull request for
3.18. We've got:

  - New Marvell hardware supportr
  - Multicast support for 6lowpan
  - Several of 6lowpan fixes & cleanups
  - Fix for a (false-positive) lockdep warning in L2CAP
  - Minor btusb cleanup"

On top of all that comes the usual sort of updates to ath5k, ath9k,
ath10k, brcmfmac, mwifiex, and wil6210.  This time around there are
also a number of rtlwifi updates to enable some new hardware and
to reconcile the in-kernel drivers with some newer releases of the
Realtek vendor drivers.  Also of note is some device tree work for
the bcma bus.

Please let me know if there are problems!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 45 insertions, 11 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index 90174a814a6d..5e832306dba9 100644
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -39,10 +39,11 @@
 #define RTL_PCI_RX_CMD_QUEUE                    1
 #define RTL_PCI_MAX_RX_QUEUE                    2
 
-#define RTL_PCI_MAX_RX_COUNT                    64
+#define RTL_PCI_MAX_RX_COUNT                    512/*64*/
 #define RTL_PCI_MAX_TX_QUEUE_COUNT              9
 
 #define RT_TXDESC_NUM                           128
+#define TX_DESC_NUM_92E                         512
 #define RT_TXDESC_NUM_BE_QUEUE                  256
 
 #define BK_QUEUE                                0
@@ -62,6 +63,12 @@
         .subdevice = PCI_ANY_ID,\
         .driver_data = (kernel_ulong_t)&(cfg)
 
+#define INTEL_VENDOR_ID                         0x8086
+#define SIS_VENDOR_ID                           0x1039
+#define ATI_VENDOR_ID                           0x1002
+#define ATI_DEVICE_ID                           0x7914
+#define AMD_VENDOR_ID                           0x1022
+
 #define PCI_MAX_BRIDGE_NUMBER                   255
 #define PCI_MAX_DEVICES                         32
 #define PCI_MAX_FUNCTION                        8
@@ -69,6 +76,11 @@
 #define PCI_CONF_ADDRESS        0x0CF8  /*PCI Configuration Space Address */
 #define PCI_CONF_DATA           0x0CFC  /*PCI Configuration Space Data */
 
+#define PCI_CLASS_BRIDGE_DEV            0x06
+#define PCI_SUBCLASS_BR_PCI_TO_PCI      0x04
+#define PCI_CAPABILITY_ID_PCI_EXPRESS   0x10
+#define PCI_CAP_ID_EXP                  0x10
+
 #define U1DONTCARE                      0xFF
 #define U2DONTCARE                      0xFFFF
 #define U4DONTCARE                      0xFFFFFFFF
@@ -87,6 +99,7 @@
 #define RTL_PCI_700F_DID        0x700F
 #define RTL_PCI_701F_DID        0x701F
 #define RTL_PCI_DLINK_DID       0x3304
+#define RTL_PCI_8723AE_DID      0x8723  /*8723e */
 #define RTL_PCI_8192CET_DID     0x8191  /*8192ce */
 #define RTL_PCI_8192CE_DID      0x8178  /*8192ce */
 #define RTL_PCI_8191CE_DID      0x8177  /*8192ce */
@@ -95,6 +108,10 @@
 #define RTL_PCI_8192DE_DID      0x8193  /*8192de */
 #define RTL_PCI_8192DE_DID2     0x002B  /*92DE*/
 #define RTL_PCI_8188EE_DID      0x8179  /*8188ee*/
+#define RTL_PCI_8723BE_DID      0xB723  /*8723be*/
+#define RTL_PCI_8192EE_DID      0x818B  /*8192ee*/
+#define RTL_PCI_8821AE_DID      0x8821  /*8821ae*/
+#define RTL_PCI_8812AE_DID      0x8812  /*8812ae*/
 
 /*8192 support 16 pages of IO registers*/
 #define RTL_MEM_MAPPED_IO_RANGE_8190PCI         0x1000
@@ -125,24 +142,34 @@ struct rtl_pci_capabilities_header {
         u8 next;
 };
 
-struct rtl_rx_desc {
-        u32 dword[8];
+/* In new TRX flow, Buffer_desc is new concept
+ * But TX wifi info == TX descriptor in old flow
+ * RX wifi info == RX descriptor in old flow
+ */
+struct rtl_tx_buffer_desc {
+#if (RTL8192EE_SEG_NUM == 2)
+        u32 dword[2*(DMA_IS_64BIT + 1)*8]; /*seg = 8*/
+#elif (RTL8192EE_SEG_NUM == 1)
+        u32 dword[2*(DMA_IS_64BIT + 1)*4]; /*seg = 4*/
+#elif (RTL8192EE_SEG_NUM == 0)
+        u32 dword[2*(DMA_IS_64BIT + 1)*2]; /*seg = 2*/
+#endif
 } __packed;
 
 struct rtl_tx_desc {
         u32 dword[16];
 } __packed;
 
-struct rtl_tx_cmd_desc {
-        u32 dword[16];
+struct rtl_rx_buffer_desc { /*rx buffer desc*/
+        u32 dword[2];
 } __packed;
 
-/* In new TRX flow, Buffer_desc is new concept
- * But TX wifi info == TX descriptor in old flow
- * RX wifi info == RX descriptor in old flow
- */
-struct rtl_tx_buffer_desc {
-        u32 dword[8]; /*seg = 4*/
+struct rtl_rx_desc { /*old: rx desc new: rx wifi info*/
+        u32 dword[8];
+} __packed;
+
+struct rtl_tx_cmd_desc {
+        u32 dword[16];
 } __packed;
 
 struct rtl8192_tx_ring {
@@ -153,6 +180,10 @@ struct rtl8192_tx_ring {
         struct sk_buff_head queue;
         /*add for new trx flow*/
         struct rtl_tx_buffer_desc *buffer_desc; /*tx buffer descriptor*/
+        dma_addr_t buffer_desc_dma; /*tx bufferd desc dma memory*/
+        u16 avl_desc; /* available_desc_to_write */
+        u16 cur_tx_wp; /* current_tx_write_point */
+        u16 cur_tx_rp; /* current_tx_read_point */
 };
 
 struct rtl8192_rx_ring {
@@ -160,6 +191,9 @@ struct rtl8192_rx_ring {
         dma_addr_t dma;
         unsigned int idx;
         struct sk_buff *rx_buf[RTL_PCI_MAX_RX_COUNT];
+        /*add for new trx flow*/
+        struct rtl_rx_buffer_desc *buffer_desc; /*rx buffer descriptor*/
+        u16 next_rx_rp; /* next_rx_read_point */
 };
 
 struct rtl_pci {