staging: vt6656: vnt_fill_cts_head remove unneeded NULL check.

[firefly-linux-kernel-4.4.55.git] / drivers / staging / vt6656 / rxtx.c

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index ea5140ab2b41432e7720835d78e668644116ad2e..3b90497bc6e8340ed7e6eb58f659253aa6e54b4f 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -36,6 +36,7 @@
  *
  */
 
+#include <linux/etherdevice.h>
 #include "device.h"
 #include "rxtx.h"
 #include "card.h"
@@ -55,7 +56,7 @@ static const u16 vnt_fb_opt0[2][5] = {
 
 static const u16 vnt_fb_opt1[2][5] = {
        {RATE_12M, RATE_18M, RATE_24M, RATE_24M, RATE_36M}, /* fallback_rate0 */
-       {RATE_6M , RATE_6M,  RATE_12M, RATE_12M, RATE_18M}, /* fallback_rate1 */
+       {RATE_6M,  RATE_6M,  RATE_12M, RATE_12M, RATE_18M}, /* fallback_rate1 */
 };
 
 #define RTSDUR_BB       0
@@ -392,8 +393,8 @@ static int vnt_fill_ieee80211_rts(struct vnt_usb_send_context *tx_context,
        rts->frame_control =
                cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_RTS);
 
-       memcpy(rts->ra, hdr->addr1, ETH_ALEN);
-       memcpy(rts->ta, hdr->addr2, ETH_ALEN);
+       ether_addr_copy(rts->ra, hdr->addr1);
+       ether_addr_copy(rts->ta, hdr->addr2);
 
        return 0;
 }
@@ -524,9 +525,6 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
        u32 cts_frame_len = 14;
        u16 current_rate = tx_context->tx_rate;
 
-       if (!head)
-               return 0;
-
        if (tx_context->fb_option) {
                /* Auto Fall back */
                struct vnt_cts_fb *buf = &head->cts_g_fb;
@@ -552,7 +550,7 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
                buf->data.frame_control =
                        cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
 
-               memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
+               ether_addr_copy(buf->data.ra, priv->current_net_addr);
 
                return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head);
        } else {
@@ -570,12 +568,10 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
                buf->data.frame_control =
                        cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_CTS);
 
-               memcpy(buf->data.ra, priv->current_net_addr, ETH_ALEN);
+               ether_addr_copy(buf->data.ra, priv->current_net_addr);
 
                return vnt_rxtx_datahead_g(tx_context, &buf->data_head);
        }
-
-       return 0;
 }
 
 static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context,
@@ -739,7 +735,7 @@ static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context,
 
                mic_hdr->id = 0x59;
                mic_hdr->payload_len = cpu_to_be16(payload_len);
-               memcpy(mic_hdr->mic_addr2, hdr->addr2, ETH_ALEN);
+               ether_addr_copy(mic_hdr->mic_addr2, hdr->addr2);
 
                ieee80211_get_key_tx_seq(tx_key, &seq);