From: Sujith Manoharan <sujith@msujith.org>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, ath9k-devel@qca.qualcomm.com
Subject: [PATCH v2 13/23] ath9k: Fix address management
Date: Fri, 17 Oct 2014 07:40:20 +0530 [thread overview]
Message-ID: <1413511830-5536-14-git-send-email-sujith@msujith.org> (raw)
In-Reply-To: <1413511830-5536-1-git-send-email-sujith@msujith.org>
From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Since both the arguments need to satisfy
the alignment requirements of ether_addr_copy(),
use memcpy() in cases where there will be no
big performance benefit and make sure that
ether_addr_copy() calls use properly aligned
arguments.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
---
drivers/net/wireless/ath/ath.h | 2 +-
drivers/net/wireless/ath/ath9k/ath9k.h | 2 +-
drivers/net/wireless/ath/ath9k/main.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index e5ba6fa..9c56ecb 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -147,7 +147,7 @@ struct ath_common {
u16 cachelsz;
u16 curaid;
u8 macaddr[ETH_ALEN];
- u8 curbssid[ETH_ALEN];
+ u8 curbssid[ETH_ALEN] __aligned(2);
u8 bssidmask[ETH_ALEN];
u32 rx_bufsize;
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index d4b71ed..9e92cb21 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -595,7 +595,7 @@ struct ath_vif {
u16 seq_no;
/* BSS info */
- u8 bssid[ETH_ALEN];
+ u8 bssid[ETH_ALEN] __aligned(2);
u16 aid;
bool assoc;
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 0545fe6..c291d54 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -1057,7 +1057,7 @@ static void ath9k_set_offchannel_state(struct ath_softc *sc)
eth_zero_addr(common->curbssid);
eth_broadcast_addr(common->bssidmask);
- ether_addr_copy(common->macaddr, vif->addr);
+ memcpy(common->macaddr, vif->addr, ETH_ALEN);
common->curaid = 0;
ah->opmode = vif->type;
ah->imask &= ~ATH9K_INT_SWBA;
@@ -1098,7 +1098,7 @@ void ath9k_calculate_summary_state(struct ath_softc *sc,
ath9k_calculate_iter_data(sc, ctx, &iter_data);
if (iter_data.has_hw_macaddr)
- ether_addr_copy(common->macaddr, iter_data.hw_macaddr);
+ memcpy(common->macaddr, iter_data.hw_macaddr, ETH_ALEN);
memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
ath_hw_setbssidmask(common);
@@ -1785,7 +1785,7 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw,
ath_dbg(common, CONFIG, "BSSID %pM Changed ASSOC %d\n",
bss_conf->bssid, bss_conf->assoc);
- ether_addr_copy(avp->bssid, bss_conf->bssid);
+ memcpy(avp->bssid, bss_conf->bssid, ETH_ALEN);
avp->aid = bss_conf->aid;
avp->assoc = bss_conf->assoc;
--
2.1.2
next prev parent reply other threads:[~2014-10-17 2:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-17 2:10 [PATCH v2 00/23] ath9k patches Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 01/23] ath9k: Use sta_state() callback Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 02/23] ath9k: Enable multi-channel properly Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 03/23] ath9k: Process beacons properly Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 04/23] ath9k: Unify reset API Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 05/23] ath9k: Set ATH_OP_HW_RESET before HW reset Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 06/23] ath9k: Disable beacon tasklet during reset Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 07/23] ath9k: Clear NoA schedule properly Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 08/23] ath9k: Use configurable timeout for flush Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 09/23] ath9k: Fix MCC flush timeout Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 10/23] ath9k: Fix offchannel " Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 11/23] ath9k: Check for pending frames properly Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 12/23] ath9k: Send AUTHORIZED event only for station mode Sujith Manoharan
2014-10-17 2:10 ` Sujith Manoharan [this message]
2014-10-17 2:10 ` [PATCH v2 14/23] ath9k: Add a function to check for an active GO Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 15/23] ath9k: Check for active GO in mgd_prepare_tx() Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 16/23] ath9k: Use a helper function for offchannel NoA Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 17/23] ath9k: Use a helper function to set NoA Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 18/23] ath9k: Use a helper function for bmiss Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 19/23] ath9k: Fix RoC expiration Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 20/23] ath9k: Send oneshot NoA Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 21/23] ath9k: Fix HW scan abort Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 22/23] ath9k: Improve flush() in mcc mode Sujith Manoharan
2014-10-17 2:10 ` [PATCH v2 23/23] ath9k: Do not start BA when scanning Sujith Manoharan
2014-10-20 9:30 ` Johannes Berg
2014-10-20 9:39 ` Sujith Manoharan
2014-10-20 10:38 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413511830-5536-14-git-send-email-sujith@msujith.org \
--to=sujith@msujith.org \
--cc=ath9k-devel@qca.qualcomm.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox