| Message ID | 1371641731-1297-1-git-send-email-ordex@autistici.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
FWIW, driver fixes like this come to me rather than Johannes... On Wed, Jun 19, 2013 at 01:35:31PM +0200, Antonio Quartulli wrote: > From: Antonio Quartulli <antonio@open-mesh.com> > > Do not unconditionally access the chan variable in > brcmf_cfg80211_mgmt_tx() as it may be NULL. > Use freq instead. > > Introduced by c2ff8cad64233b539c71a27e2a6e324001143ef0 > ("brcm80211: make mgmt_tx in brcmfmac accept a NULL channel") > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Antonio Quartulli <antonio@open-mesh.com> > --- > drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c > index 8bd256b..d316d62 100644 > --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c > +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c > @@ -3985,8 +3985,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, > le16_to_cpu(action_frame->len)); > > brcmf_dbg(TRACE, "Action frame, cookie=%lld, len=%d, freq=%d\n", > - *cookie, le16_to_cpu(action_frame->len), > - chan->center_freq); > + *cookie, le16_to_cpu(action_frame->len), freq); > > ack = brcmf_p2p_send_action_frame(cfg, cfg_to_ndev(cfg), > af_params); > -- > 1.8.1.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
Hi John, On Wed, Jun 19, 2013 at 12:27:14PM -0700, John W. Linville wrote: > FWIW, driver fixes like this come to me rather than Johannes... > I sent this to Johannes because this is fixing a patch I sent a couple of days ago, and therefore I did not know if this patch was already in your tree or not. Cheers,
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index 8bd256b..d316d62 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c @@ -3985,8 +3985,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, le16_to_cpu(action_frame->len)); brcmf_dbg(TRACE, "Action frame, cookie=%lld, len=%d, freq=%d\n", - *cookie, le16_to_cpu(action_frame->len), - chan->center_freq); + *cookie, le16_to_cpu(action_frame->len), freq); ack = brcmf_p2p_send_action_frame(cfg, cfg_to_ndev(cfg), af_params);