From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 8354230435840 X-Received: by 10.112.97.37 with SMTP id dx5mr633990lbb.15.1426520498695; Mon, 16 Mar 2015 08:41:38 -0700 (PDT) X-BeenThere: outreachy-kernel@googlegroups.com Received: by 10.152.37.194 with SMTP id a2ls634212lak.88.gmail; Mon, 16 Mar 2015 08:41:38 -0700 (PDT) X-Received: by 10.112.224.12 with SMTP id qy12mr9159740lbc.10.1426520497627; Mon, 16 Mar 2015 08:41:37 -0700 (PDT) Return-Path: Received: from mail-wg0-x22c.google.com (mail-wg0-x22c.google.com. [2a00:1450:400c:c00::22c]) by gmr-mx.google.com with ESMTPS id sf8si713663wic.2.2015.03.16.08.41.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 08:41:37 -0700 (PDT) Received-SPF: pass (google.com: domain of hamohammed.sa@gmail.com designates 2a00:1450:400c:c00::22c as permitted sender) client-ip=2a00:1450:400c:c00::22c; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of hamohammed.sa@gmail.com designates 2a00:1450:400c:c00::22c as permitted sender) smtp.mail=hamohammed.sa@gmail.com; dkim=pass header.i=@gmail.com; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Received: by mail-wg0-x22c.google.com with SMTP id v3so43283592wgg.1 for ; Mon, 16 Mar 2015 08:41:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2EfWRjqPYKvz8C2PbVh4dRVExYdRTCAjrPRZs4ZLqzM=; b=h7+0GbVdRDIHes4bMJR+SGPYrf7SDogm/6u+5wvcOiZSdBs85DaeVyEFH3wLj41Hgn arGJd6Yi87P9ktmiDpGcW1RV4Wi24kBprQumk1mi8/4tX7CK/+opRbYl0U/WgfqbhRvm RzEcAiTvHbw3+Pq1fARucKKW5+L1S8BKaLoRtHq4suOS8EsY1DJ4/zRz9drwQV39yCe9 RNhaGtHkLCZ7oNPtv2WL0MLIduivlV95jUpsMZItbiB/oh68oc4OM371zGDEAVK6JhgZ 51DS9NM6xNbDIBWav9p6hyLjCkh+6yo99xtJ+Hl7/r9ev64gP1frzfujWGhCG7/w4lM4 jmcQ== X-Received: by 10.180.84.3 with SMTP id u3mr53701771wiy.38.1426520497398; Mon, 16 Mar 2015 08:41:37 -0700 (PDT) Return-Path: Received: from haneen-vb ([79.170.55.48]) by mx.google.com with ESMTPSA id dm6sm15850364wib.22.2015.03.16.08.41.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 08:41:36 -0700 (PDT) Received: by haneen-vb (Postfix, from userid 1000) id 8E5B9C1F5A; Mon, 16 Mar 2015 18:41:32 +0300 (AST) From: Haneen Mohammed To: outreachy-kernel@googlegroups.com Cc: Haneen Mohammed Subject: [PATCH v2] Staging: rtl8712: replace memcpy with ether_addr_copy Date: Mon, 16 Mar 2015 18:41:31 +0300 Message-Id: <1426520491-6131-1-git-send-email-hamohammed.sa@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20150316144736.GB24906@kroah.com> References: <20150316144736.GB24906@kroah.com> This patch replace memcpy with ethe_addr_copy to address the following warning generated by checkpatch.pl: ""Prefer ether_addr_copy over memcpy if the Ethernet addresses are __aligned(2)" Follwoing is the output of pahole for the relevant datastructures: 1- for "iwe.u.ap_addr.sa_data" and "wrqu->ap_addr.sa_data" struct sockaddr { sa_family_t sa_family; /* 0 2 */ char sa_data[14]; /* 2 14 */ /* size: 16, cachelines: 1, members: 2 */ /* last cacheline: 16 bytes */ }; struct iw_event { __u16 len; /* 0 2 */ __u16 cmd; /* 2 2 */ /* XXX 4 bytes hole, try to pack */ union iwreq_data u; /* 8 16 */ /* size: 24, cachelines: 1, members: 3 */ /* sum members: 20, holes: 1, sum holes: 4 */ /* last cacheline: 24 bytes */ }; 2- for "pnetwork->network.MacAddress" and "pcur_bss->MacAddress" struct wlan_network { struct list_head list; /* 0 16 */ int network_type; /* 16 4 */ int fixed; /* 20 4 */ unsigned int last_scanned; /* 24 4 */ int aid; /* 28 4 */ int join_res; /* 32 4 */ struct ndis_wlan_bssid_ex network; /* 36 884 */ /* --- cacheline 14 boundary (896 bytes) was 24 bytes ago --- */ /* size: 920, cachelines: 15, members: 7 */ /* last cacheline: 24 bytes */ }; struct ndis_wlan_bssid_ex { u32 Length; /* 0 4 */ unsigned char MacAddress[6]; /* 4 6 */ u8 Reserved[2]; /* 10 2 */ struct ndis_802_11_ssid Ssid; /* 12 36 */ u32 Privacy; /* 48 4 */ s32 Rssi; /* 52 4 */ enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; /* 56 4 */ struct NDIS_802_11_CONFIGURATION Configuration; /* 60 32 */ /* --- cacheline 1 boundary (64 bytes) was 28 bytes ago --- */ enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; /* 92 4 */ NDIS_802_11_RATES_EX SupportedRates; /* 96 16 */ u32 IELength; /* 112 4 */ u8 IEs[768]; /* 116 768 */ /* --- cacheline 13 boundary (832 bytes) was 52 bytes ago --- */ /* size: 884, cachelines: 14, members: 12 */ /* last cacheline: 52 bytes */ }; Signed-off-by: Haneen Mohammed --- v2: fix commit msg drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index eacba8c..81f39c3 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -185,7 +185,7 @@ static inline char *translate_scan(struct _adapter *padapter, /* AP MAC address */ iwe.cmd = SIOCGIWAP; iwe.u.ap_addr.sa_family = ARPHRD_ETHER; - memcpy(iwe.u.ap_addr.sa_data, pnetwork->network.MacAddress, ETH_ALEN); + ether_addr_copy(iwe.u.ap_addr.sa_data, pnetwork->network.MacAddress); start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN); /* Add the ESSID */ iwe.cmd = SIOCGIWESSID; @@ -1117,7 +1117,7 @@ static int r8711_wx_get_wap(struct net_device *dev, wrqu->ap_addr.sa_family = ARPHRD_ETHER; if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE | WIFI_AP_STATE)) - memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN); + ether_addr_copy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress); else eth_zero_addr(wrqu->ap_addr.sa_data); return 0; -- 1.9.1