ath9k_htc: remove useless memcpy
authorOleksij Rempel <linux@rempel-privat.de>
Tue, 4 Feb 2014 09:27:49 +0000 (10:27 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Feb 2014 20:36:02 +0000 (15:36 -0500)
after switch to common fucntions we do not need this memcpy any more.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c

index c30af6d..47b2bfc 100644 (file)
@@ -995,12 +995,14 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
        ath9k_htc_err_stat_rx(priv, rxstatus);
 
        /* Get the RX status information */
-       memcpy(&rxbuf->rxstatus, rxstatus, HTC_RX_FRAME_HEADER_SIZE);
-       skb_pull(skb, HTC_RX_FRAME_HEADER_SIZE);
 
        memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
 
-       rx_status_htc_to_ath(&rx_stats, &rxbuf->rxstatus);
+       /* Copy everything from ath_htc_rx_status (HTC_RX_FRAME_HEADER).
+        * After this, we can drop this part of skb. */
+       rx_status_htc_to_ath(&rx_stats, rxstatus);
+       rx_status->mactime = be64_to_cpu(rxstatus->rs_tstamp);
+       skb_pull(skb, HTC_RX_FRAME_HEADER_SIZE);
 
        /*
         * everything but the rate is checked here, the rate check is done
@@ -1020,8 +1022,6 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
        rx_stats.is_mybeacon = ath_is_mybeacon(common, hdr);
        ath9k_cmn_process_rssi(common, hw, &rx_stats, rx_status);
 
-       rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp);
-
        rx_status->band = ah->curchan->chan->band;
        rx_status->freq = ah->curchan->chan->center_freq;
        rx_status->antenna = rx_stats.rs_antenna;