You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
98 lines
3.0 KiB
Diff
98 lines
3.0 KiB
Diff
From: Arend van Spriel <arend@broadcom.com>
|
|
Date: Wed, 26 Aug 2015 22:15:03 +0200
|
|
Subject: [PATCH] brcmfmac: change prototype for brcmf_fws_hdrpull()
|
|
|
|
Instead of passing ifidx and drvr just pass struct brcmf_if pointer
|
|
which holds both parameters.
|
|
|
|
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>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcdc.c
|
|
@@ -312,8 +312,7 @@ brcmf_proto_bcdc_hdrpull(struct brcmf_pu
|
|
|
|
skb_pull(pktbuf, BCDC_HEADER_LEN);
|
|
if (do_fws)
|
|
- brcmf_fws_hdrpull(drvr, tmp_if->ifidx, h->data_offset << 2,
|
|
- pktbuf);
|
|
+ brcmf_fws_hdrpull(tmp_if, h->data_offset << 2, pktbuf);
|
|
else
|
|
skb_pull(pktbuf, h->data_offset << 2);
|
|
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
|
|
@@ -1616,11 +1616,10 @@ static int brcmf_fws_notify_bcmc_credit_
|
|
return 0;
|
|
}
|
|
|
|
-int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
|
|
- struct sk_buff *skb)
|
|
+void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb)
|
|
{
|
|
struct brcmf_skb_reorder_data *rd;
|
|
- struct brcmf_fws_info *fws = drvr->fws;
|
|
+ struct brcmf_fws_info *fws = ifp->drvr->fws;
|
|
u8 *signal_data;
|
|
s16 data_len;
|
|
u8 type;
|
|
@@ -1630,20 +1629,20 @@ int brcmf_fws_hdrpull(struct brcmf_pub *
|
|
s32 err;
|
|
|
|
brcmf_dbg(HDRS, "enter: ifidx %d, skblen %u, sig %d\n",
|
|
- ifidx, skb->len, signal_len);
|
|
+ ifp->ifidx, skb->len, siglen);
|
|
|
|
- WARN_ON(signal_len > skb->len);
|
|
+ WARN_ON(siglen > skb->len);
|
|
|
|
- if (!signal_len)
|
|
- return 0;
|
|
+ if (!siglen)
|
|
+ return;
|
|
/* if flow control disabled, skip to packet data and leave */
|
|
if ((!fws) || (!fws->fw_signals)) {
|
|
- skb_pull(skb, signal_len);
|
|
- return 0;
|
|
+ skb_pull(skb, siglen);
|
|
+ return;
|
|
}
|
|
|
|
fws->stats.header_pulls++;
|
|
- data_len = signal_len;
|
|
+ data_len = siglen;
|
|
signal_data = skb->data;
|
|
|
|
status = BRCMF_FWS_RET_OK_NOSCHEDULE;
|
|
@@ -1731,14 +1730,12 @@ int brcmf_fws_hdrpull(struct brcmf_pub *
|
|
/* signalling processing result does
|
|
* not affect the actual ethernet packet.
|
|
*/
|
|
- skb_pull(skb, signal_len);
|
|
+ skb_pull(skb, siglen);
|
|
|
|
/* this may be a signal-only packet
|
|
*/
|
|
if (skb->len == 0)
|
|
fws->stats.header_only_pkt++;
|
|
-
|
|
- return 0;
|
|
}
|
|
|
|
static u8 brcmf_fws_precommit_skb(struct brcmf_fws_info *fws, int fifo,
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h
|
|
@@ -21,8 +21,7 @@
|
|
int brcmf_fws_init(struct brcmf_pub *drvr);
|
|
void brcmf_fws_deinit(struct brcmf_pub *drvr);
|
|
bool brcmf_fws_fc_active(struct brcmf_fws_info *fws);
|
|
-int brcmf_fws_hdrpull(struct brcmf_pub *drvr, int ifidx, s16 signal_len,
|
|
- struct sk_buff *skb);
|
|
+void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb);
|
|
int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb);
|
|
|
|
void brcmf_fws_reset_interface(struct brcmf_if *ifp);
|