Revert "BACKPORT: ath10k: fix rfc1042 header retrieval in QCA4019 with eth decap mode"
This reverts commit f34dcee1df67454b36803063fa57093fa1d082f0.
Reason for revert: Please refer b/195375170
Original change's description:
> BACKPORT: ath10k: fix rfc1042 header retrieval in QCA4019 with eth decap mode
>
> Chipset from QCA99X0 onwards (QCA99X0, QCA9984, QCA4019 & future)
> rx_hdr_status is not padded to align in 4-byte boundary. Define a
> new hw_params field to handle different alignment behaviour between
> different hw. This patch fixes improper retrieval of rfc1042 header
> with QCA4019. This patch along with "ath10k: Properly remove padding
> from the start of rx payload" will fix traffic failure in ethernet
> decap mode for QCA4019.
>
> BUG=b:179418147
> TEST=Compile tested only.
>
> (cherry picked from commit 2f38c3c01de945234d23dd163e3528ccb413066d)
> (source: https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git)
>
> Change-Id: I6a76313fda2d3277829980c0a55ac14a0f3a3f85
> Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@codeaurora.org>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
> Signed-off-by: Maharaja Kennadyrajan <mkenna@codeaurora.org>
> Signed-off-by: Vadiraj Kakhandaki <vadirajk@google.com>
> Signed-off-by: Julan Hsu <julanhsu@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2948592
> Reviewed-by: Maharaja Kennadyrajan <mkenna@qualcomm.corp-partner.google.com>
> (cherry picked from commit 77ad0a08e72c9155f1a8b54825654ac8780f8955)
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2966567
> Tested-by: ANKIT DARSI AMARNATHAGUPTHA <dankit@google.com>
Bug: b:179418147
Change-Id: Ied4e98fc08216a3f686f4a855c307aa97f998282
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3069057
Tested-by: ANKIT DARSI AMARNATHAGUPTHA <dankit@google.com>
Reviewed-by: SHAMANTHA KUMAR PERAMACHANAHALLI RAMARAO <shamanthakumar@google.com>
Reviewed-by: Julan Hsu <julanhsu@google.com>
Commit-Queue: Julan Hsu <julanhsu@google.com>
diff --git a/drivers/net/wireless-4.2/ath/ath10k/core.c b/drivers/net/wireless-4.2/ath/ath10k/core.c
index 3ffc8b6f..bda5d166 100644
--- a/drivers/net/wireless-4.2/ath/ath10k/core.c
+++ b/drivers/net/wireless-4.2/ath/ath10k/core.c
@@ -93,7 +93,6 @@
.board_size = QCA988X_BOARD_DATA_SZ,
.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,
},
- .decap_align_bytes = 4,
},
{
.id = QCA6174_HW_2_1_VERSION,
@@ -113,7 +112,6 @@
.board_size = QCA6174_BOARD_DATA_SZ,
.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,
},
- .decap_align_bytes = 4,
},
{
.id = QCA6174_HW_2_1_VERSION,
@@ -133,7 +131,6 @@
.board_size = QCA6174_BOARD_DATA_SZ,
.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,
},
- .decap_align_bytes = 4,
},
{
.id = QCA6174_HW_3_0_VERSION,
@@ -154,7 +151,6 @@
.board_size = QCA6174_BOARD_DATA_SZ,
.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,
},
- .decap_align_bytes = 4,
},
{
.id = QCA6174_HW_3_2_VERSION,
@@ -176,7 +172,6 @@
.board_size = QCA6174_BOARD_DATA_SZ,
.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,
},
- .decap_align_bytes = 4,
},
{
.id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -203,7 +198,6 @@
.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,
},
.sw_decrypt_mcast_mgmt = true,
- .decap_align_bytes = 1,
},
{
.id = QCA9377_HW_1_0_DEV_VERSION,
@@ -223,7 +217,6 @@
.board_size = QCA9377_BOARD_DATA_SZ,
.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,
},
- .decap_align_bytes = 4,
},
{
.id = QCA9377_HW_1_1_DEV_VERSION,
@@ -243,7 +236,6 @@
.board_size = QCA9377_BOARD_DATA_SZ,
.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,
},
- .decap_align_bytes = 4,
},
{
.id = QCA4019_HW_1_0_DEV_VERSION,
@@ -272,7 +264,6 @@
.board_ext_size = QCA4019_BOARD_EXT_DATA_SZ,
},
.sw_decrypt_mcast_mgmt = true,
- .decap_align_bytes = 1,
},
};
diff --git a/drivers/net/wireless-4.2/ath/ath10k/core.h b/drivers/net/wireless-4.2/ath/ath10k/core.h
index 23e8245..0b6f829 100644
--- a/drivers/net/wireless-4.2/ath/ath10k/core.h
+++ b/drivers/net/wireless-4.2/ath/ath10k/core.h
@@ -928,9 +928,6 @@
* frames encrypted and expect software do decryption.
*/
bool sw_decrypt_mcast_mgmt;
-
- /* Number of bytes used for alignment in rx_hdr_status of rx desc. */
- int decap_align_bytes;
} hw_params;
const struct firmware *board;
diff --git a/drivers/net/wireless-4.2/ath/ath10k/htt_rx.c b/drivers/net/wireless-4.2/ath/ath10k/htt_rx.c
index f18e494..50b4142 100644
--- a/drivers/net/wireless-4.2/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless-4.2/ath/ath10k/htt_rx.c
@@ -1165,7 +1165,6 @@
size_t hdr_len, crypto_len;
void *rfc1042;
bool is_first, is_last, is_amsdu;
- int bytes_aligned = ar->hw_params.decap_align_bytes;
rxd = (void *)msdu->data - sizeof(*rxd);
hdr = (void *)rxd->rx_hdr_status;
@@ -1182,8 +1181,8 @@
hdr_len = ieee80211_hdrlen(hdr->frame_control);
crypto_len = ath10k_htt_rx_crypto_param_len(ar, enctype);
- rfc1042 += round_up(hdr_len, bytes_aligned) +
- round_up(crypto_len, bytes_aligned);
+ rfc1042 += round_up(hdr_len, 4) +
+ round_up(crypto_len, 4);
}
if (is_amsdu)
