From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753704AbbEALIy (ORCPT ); Fri, 1 May 2015 07:08:54 -0400 Received: from mail-pd0-f174.google.com ([209.85.192.174]:35452 "EHLO mail-pd0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753502AbbEALIx (ORCPT ); Fri, 1 May 2015 07:08:53 -0400 From: Abhishek Bist To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, abhishek@emblogic.org, stankus.modestas@gmail.com, Abhishek Bist Subject: [PATCH] Staging : wlan-ng: fix memcpy with ether_addr_copy in p80211conv.c Date: Fri, 1 May 2015 16:38:37 +0530 Message-Id: <1430478517-15601-1-git-send-email-ishubist@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a patch which fixes memcpy warning found by a checpatch.pl in p80211conv.c and replaces memcpy with ether_addr_copy. Signed-off-by: Abhishek-Bist --- drivers/staging/wlan-ng/p80211conv.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index bd69e8c..87661ba 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c @@ -178,21 +178,23 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, switch (wlandev->macmode) { case WLAN_MACMODE_IBSS_STA: - memcpy(p80211_hdr->a3.a1, &e_hdr.daddr, ETH_ALEN); - memcpy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, ETH_ALEN); - memcpy(p80211_hdr->a3.a3, wlandev->bssid, ETH_ALEN); + ether_addr_copy(p80211_hdr->a3.a1, &e_hdr.daddr, ETH_ALEN); + ether_addr_copy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, + ETH_ALEN); + ether_addr_copy(p80211_hdr->a3.a3, wlandev->bssid, ETH_ALEN); break; case WLAN_MACMODE_ESS_STA: fc |= cpu_to_le16(WLAN_SET_FC_TODS(1)); - memcpy(p80211_hdr->a3.a1, wlandev->bssid, ETH_ALEN); - memcpy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, ETH_ALEN); - memcpy(p80211_hdr->a3.a3, &e_hdr.daddr, ETH_ALEN); + ether_addr_copy(p80211_hdr->a3.a1, wlandev->bssid, ETH_ALEN); + ether_addr_copy(p80211_hdr->a3.a2, wlandev->netdev->dev_addr, + ETH_ALEN); + ether_addr_copy(p80211_hdr->a3.a3, &e_hdr.daddr, ETH_ALEN); break; case WLAN_MACMODE_ESS_AP: fc |= cpu_to_le16(WLAN_SET_FC_FROMDS(1)); - memcpy(p80211_hdr->a3.a1, &e_hdr.daddr, ETH_ALEN); - memcpy(p80211_hdr->a3.a2, wlandev->bssid, ETH_ALEN); - memcpy(p80211_hdr->a3.a3, &e_hdr.saddr, ETH_ALEN); + ether_addr_copy(p80211_hdr->a3.a1, &e_hdr.daddr, ETH_ALEN); + ether_addr_copy(p80211_hdr->a3.a2, wlandev->bssid, ETH_ALEN); + ether_addr_copy(p80211_hdr->a3.a3, &e_hdr.saddr, ETH_ALEN); break; default: netdev_err(wlandev->netdev, @@ -241,7 +243,7 @@ static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac, for (i = 0; i < wlandev->spy_number; i++) { if (!memcmp(wlandev->spy_address[i], mac, ETH_ALEN)) { - memcpy(wlandev->spy_address[i], mac, ETH_ALEN); + ether_addr_copy(wlandev->spy_address[i], mac, ETH_ALEN); wlandev->spy_stat[i].level = rxmeta->signal; wlandev->spy_stat[i].noise = rxmeta->noise; wlandev->spy_stat[i].qual = -- 1.8.3.1