aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHante Meuleman <meuleman@broadcom.com>2014-07-30 07:20:01 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-07-31 13:41:45 -0400
commit9374a2b514194acd4865f0183acd7c48c3b36b05 (patch)
tree34698ecbcd89d352d67fffeb33a236d89bb2d6a7
parent46de06839b4936cc5fd4e6638b8fbf8437bce29e (diff)
brcmfmac: Export brcmf_netif_rx for new protocol msgbuf.
Reviewed-by: Arend Van Spriel <arend@broadcom.com> Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com> Signed-off-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd.h1
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 7da6441bcfa8..1825f736fd45 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -181,6 +181,7 @@ void brcmf_txflowblock_if(struct brcmf_if *ifp,
181 enum brcmf_netif_stop_reason reason, bool state); 181 enum brcmf_netif_stop_reason reason, bool state);
182void brcmf_txfinalize(struct brcmf_pub *drvr, struct sk_buff *txp, u8 ifidx, 182void brcmf_txfinalize(struct brcmf_pub *drvr, struct sk_buff *txp, u8 ifidx,
183 bool success); 183 bool success);
184void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb);
184 185
185/* Sets dongle media info (drv_version, mac address). */ 186/* Sets dongle media info (drv_version, mac address). */
186int brcmf_c_preinit_dcmds(struct brcmf_if *ifp); 187int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index bf448081d6fb..7e14e5fa4744 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -288,7 +288,7 @@ void brcmf_txflowblock(struct device *dev, bool state)
288 brcmf_fws_bus_blocked(drvr, state); 288 brcmf_fws_bus_blocked(drvr, state);
289} 289}
290 290
291static void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb) 291void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb)
292{ 292{
293 skb->dev = ifp->ndev; 293 skb->dev = ifp->ndev;
294 skb->protocol = eth_type_trans(skb, skb->dev); 294 skb->protocol = eth_type_trans(skb, skb->dev);