From: "Arend van Spriel" <arend@broadcom.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 09/16] brcmfmac: remove use of unconditional access of struct wireless_dev::netdev
Date: Fri, 5 Apr 2013 10:57:47 +0200 [thread overview]
Message-ID: <1365152274-4252-10-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1365152274-4252-1-git-send-email-arend@broadcom.com>
With the introduction of the P2P_DEVICE interface type an instance of
struct wireless_dev does not always have a netdev assigned to it. Better
use container_of() construct to obtain internal structure and go from
there.
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Piotr Haber <phaber@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index beba7f6..56359e3 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3868,13 +3868,13 @@ brcmf_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
struct wireless_dev *wdev,
u16 frame_type, bool reg)
{
- struct brcmf_if *ifp = netdev_priv(wdev->netdev);
- struct brcmf_cfg80211_vif *vif = ifp->vif;
+ struct brcmf_cfg80211_vif *vif;
u16 mgmt_type;
brcmf_dbg(TRACE, "Enter, frame_type %04x, reg=%d\n", frame_type, reg);
mgmt_type = (frame_type & IEEE80211_FCTL_STYPE) >> 4;
+ vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
if (reg)
vif->mgmt_rx_reg |= BIT(mgmt_type);
else
@@ -3890,7 +3890,6 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
{
struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
const struct ieee80211_mgmt *mgmt;
- struct brcmf_if *ifp;
struct brcmf_cfg80211_vif *vif;
s32 err = 0;
s32 ie_offset;
@@ -3926,8 +3925,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
ie_offset = DOT11_MGMT_HDR_LEN +
DOT11_BCN_PRB_FIXED_LEN;
ie_len = len - ie_offset;
- ifp = netdev_priv(wdev->netdev);
- vif = ifp->vif;
+ vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
if (vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif)
vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
err = brcmf_vif_set_mgmt_ie(vif,
@@ -3962,7 +3960,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
*cookie, le16_to_cpu(action_frame->len),
chan->center_freq);
- ack = brcmf_p2p_send_action_frame(cfg, wdev->netdev,
+ ack = brcmf_p2p_send_action_frame(cfg, cfg_to_ndev(cfg),
af_params);
cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, ack,
--
1.7.10.4
next prev parent reply other threads:[~2013-04-05 8:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 8:57 [PATCH 00/16] brcm80211: patches providing new functionality Arend van Spriel
2013-04-05 8:57 ` [PATCH 01/16] brcmfmac: fix unaligned access in TXSTATUS signal handling Arend van Spriel
2013-04-05 8:57 ` [PATCH 02/16] brcmfmac: handle firmware signalling destination entry state Arend van Spriel
2013-04-05 8:57 ` [PATCH 03/16] brcmfmac: handle firmware signals requesting for packets Arend van Spriel
2013-04-05 8:57 ` [PATCH 04/16] brcmfmac: read firmware console without trap indication Arend van Spriel
2013-04-05 8:57 ` [PATCH 05/16] brcmfmac: firmware shared data version fix Arend van Spriel
2013-04-05 8:57 ` [PATCH 06/16] brcmfmac: add hexadecimal trace of message payload Arend van Spriel
2013-04-05 8:57 ` [PATCH 07/16] brcmfmac: add role attribute to struct brcmf_if_event definition Arend van Spriel
2013-04-05 8:57 ` [PATCH 08/16] brcmfmac: remove condition for calling event handler Arend van Spriel
2013-04-05 8:57 ` Arend van Spriel [this message]
2013-04-05 8:57 ` [PATCH 10/16] brcmfmac: use struct brcmf_if instance as parameter in brcmf_set_mpc() Arend van Spriel
2013-04-05 8:57 ` [PATCH 11/16] brcmfmac: use struct brcmf_if instance iso netdevice in escan functions Arend van Spriel
2013-04-05 8:57 ` [PATCH 12/16] brcmfmac: support creation of P2P_DEVICE through user-space Arend van Spriel
2013-04-05 8:57 ` [PATCH 13/16] brcmfmac: wait for firmware event when creating P2P_DEVICE interface Arend van Spriel
2013-04-05 8:57 ` [PATCH 14/16] brcmfmac: fix reception of P2P probe requests on " Arend van Spriel
2013-04-05 8:57 ` [PATCH 15/16] brcmfmac: obtain wdev using vif object in action frame rx Arend van Spriel
2013-04-05 8:57 ` [PATCH 16/16] brcmfmac: only use ifidx from BDC header in brcmf_rx_frames() Arend van Spriel
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=1365152274-4252-10-git-send-email-arend@broadcom.com \
--to=arend@broadcom.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;
as well as URLs for NNTP newsgroup(s).