aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2015-08-26 22:14:54 +0200
committerKalle Valo <kvalo@codeaurora.org>2015-09-29 10:28:30 +0300
commit796cfb65e3ed01a9b08e3a0b93e34120c54bbbd2 (patch)
tree06859c5adc608d918d591dba1f0a45d6871b942c /drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
parent75effb03ee8e4c9d4bbc909118ce5444b047dfde (diff)
downloadkernel_replicant_linux-796cfb65e3ed01a9b08e3a0b93e34120c54bbbd2.tar.gz
kernel_replicant_linux-796cfb65e3ed01a9b08e3a0b93e34120c54bbbd2.tar.bz2
kernel_replicant_linux-796cfb65e3ed01a9b08e3a0b93e34120c54bbbd2.zip
brcmfmac: make brcmf_proto_hdrpull() return struct brcmf_if instance
Avoid spreading the ifidx in the driver, but have it return the struct brcmf_if instance. Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
index 1271d1d86ec9..d582f6993574 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
@@ -522,7 +522,7 @@ static int brcmf_msgbuf_set_dcmd(struct brcmf_pub *drvr, int ifidx,
static int brcmf_msgbuf_hdrpull(struct brcmf_pub *drvr, bool do_fws,
- u8 *ifidx, struct sk_buff *skb)
+ struct sk_buff *skb, struct brcmf_if **ifp)
{
return -ENODEV;
}
@@ -1082,7 +1082,7 @@ brcmf_msgbuf_rx_skb(struct brcmf_msgbuf *msgbuf, struct sk_buff *skb,
struct brcmf_if *ifp;
ifp = brcmf_get_ifp(msgbuf->drvr, ifidx);
- if (IS_ERR_OR_NULL(ifp) || !ifp->ndev) {
+ if (!ifp || !ifp->ndev) {
brcmf_err("Received pkt for invalid ifidx %d\n", ifidx);
brcmu_pkt_buf_free_skb(skb);
return;