Merge tag 'wireless-drivers-next-for-davem-2017-06-25' of git://git.kernel.org/pub...

[karo-tx-linux.git] / drivers / net / wireless / ath / wil6210 / wmi.c

diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 26cf722e1495354104f765e7d3014ef14574654c..65ef67321fc0a54978d168c0902f978fa2ce4912 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -689,11 +689,11 @@ static void wmi_evt_eapol_rx(struct wil6210_priv *wil, int id,
                return;
        }
 
-       eth = (struct ethhdr *)skb_put(skb, ETH_HLEN);
+       eth = skb_put(skb, ETH_HLEN);
        ether_addr_copy(eth->h_dest, ndev->dev_addr);
        ether_addr_copy(eth->h_source, evt->src_mac);
        eth->h_proto = cpu_to_be16(ETH_P_PAE);
-       memcpy(skb_put(skb, eapol_len), evt->eapol, eapol_len);
+       skb_put_data(skb, evt->eapol, eapol_len);
        skb->protocol = eth_type_trans(skb, ndev);
        if (likely(netif_rx_ni(skb) == NET_RX_SUCCESS)) {
                ndev->stats.rx_packets++;