@@ -1844,15 +1844,14 @@ static void ath10k_htt_rx_h_csum_offload(struct ath10k_hw_params *hw,
1844
1844
}
1845
1845
1846
1846
static u64 ath10k_htt_rx_h_get_pn (struct ath10k * ar , struct sk_buff * skb ,
1847
- u16 offset ,
1848
1847
enum htt_rx_mpdu_encrypt_type enctype )
1849
1848
{
1850
1849
struct ieee80211_hdr * hdr ;
1851
1850
u64 pn = 0 ;
1852
1851
u8 * ehdr ;
1853
1852
1854
- hdr = (struct ieee80211_hdr * )( skb -> data + offset ) ;
1855
- ehdr = skb -> data + offset + ieee80211_hdrlen (hdr -> frame_control );
1853
+ hdr = (struct ieee80211_hdr * )skb -> data ;
1854
+ ehdr = skb -> data + ieee80211_hdrlen (hdr -> frame_control );
1856
1855
1857
1856
if (enctype == HTT_RX_MPDU_ENCRYPT_AES_CCM_WPA2 ) {
1858
1857
pn = ehdr [0 ];
@@ -1866,19 +1865,17 @@ static u64 ath10k_htt_rx_h_get_pn(struct ath10k *ar, struct sk_buff *skb,
1866
1865
}
1867
1866
1868
1867
static bool ath10k_htt_rx_h_frag_multicast_check (struct ath10k * ar ,
1869
- struct sk_buff * skb ,
1870
- u16 offset )
1868
+ struct sk_buff * skb )
1871
1869
{
1872
1870
struct ieee80211_hdr * hdr ;
1873
1871
1874
- hdr = (struct ieee80211_hdr * )( skb -> data + offset ) ;
1872
+ hdr = (struct ieee80211_hdr * )skb -> data ;
1875
1873
return !is_multicast_ether_addr (hdr -> addr1 );
1876
1874
}
1877
1875
1878
1876
static bool ath10k_htt_rx_h_frag_pn_check (struct ath10k * ar ,
1879
1877
struct sk_buff * skb ,
1880
1878
u16 peer_id ,
1881
- u16 offset ,
1882
1879
enum htt_rx_mpdu_encrypt_type enctype )
1883
1880
{
1884
1881
struct ath10k_peer * peer ;
@@ -1893,14 +1890,14 @@ static bool ath10k_htt_rx_h_frag_pn_check(struct ath10k *ar,
1893
1890
return false;
1894
1891
}
1895
1892
1896
- hdr = (struct ieee80211_hdr * )( skb -> data + offset ) ;
1893
+ hdr = (struct ieee80211_hdr * )skb -> data ;
1897
1894
if (ieee80211_is_data_qos (hdr -> frame_control ))
1898
1895
tid = ieee80211_get_tid (hdr );
1899
1896
else
1900
1897
tid = ATH10K_TXRX_NON_QOS_TID ;
1901
1898
1902
1899
last_pn = & peer -> frag_tids_last_pn [tid ];
1903
- new_pn .pn48 = ath10k_htt_rx_h_get_pn (ar , skb , offset , enctype );
1900
+ new_pn .pn48 = ath10k_htt_rx_h_get_pn (ar , skb , enctype );
1904
1901
frag_number = le16_to_cpu (hdr -> seq_ctrl ) & IEEE80211_SCTL_FRAG ;
1905
1902
seq = IEEE80211_SEQ_TO_SN (__le16_to_cpu (hdr -> seq_ctrl ));
1906
1903
@@ -2059,13 +2056,11 @@ static void ath10k_htt_rx_h_mpdu(struct ath10k *ar,
2059
2056
frag_pn_check = ath10k_htt_rx_h_frag_pn_check (ar ,
2060
2057
msdu ,
2061
2058
peer_id ,
2062
- 0 ,
2063
2059
enctype );
2064
2060
2065
2061
if (frag )
2066
2062
multicast_check = ath10k_htt_rx_h_frag_multicast_check (ar ,
2067
- msdu ,
2068
- 0 );
2063
+ msdu );
2069
2064
2070
2065
if (!frag_pn_check || !multicast_check ) {
2071
2066
/* Discard the fragment with invalid PN or multicast DA
0 commit comments