* [PATCH 1/2] brcmfmac: drop unneeded function declarations from headers @ 2017-01-17 16:34 Rafał Miłecki 2017-01-17 16:34 ` [PATCH 2/2] brcmfmac: move function declarations to proper headers Rafał Miłecki 2017-01-18 8:56 ` [PATCH 1/2] brcmfmac: drop unneeded function declarations from headers Arend Van Spriel 0 siblings, 2 replies; 6+ messages in thread From: Rafał Miłecki @ 2017-01-17 16:34 UTC (permalink / raw) To: Kalle Valo Cc: Arend van Spriel, Franky Lin, Hante Meuleman, Pieter-Paul Giesberts, Franky Lin, linux-wireless, brcm80211-dev-list.pdl, Rafał Miłecki From: Rafał Miłecki <rafal@milecki.pl> Functions brcmf_c_prec_enq and brcmf_sdio_init don't exist so we really don't need their declarations. Function brcmf_parse_tlvs is used in cfg80211.c only so make it static and drop from header as well. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 4 ---- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h index e21f760..b5bb971 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h @@ -218,9 +218,6 @@ int brcmf_bus_get_memdump(struct brcmf_bus *bus, void *data, size_t len) * interface functions from common layer */ -bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, struct sk_buff *pkt, - int prec); - /* Receive frame for delivery to OS. Callee disposes of rxp. */ void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_event); /* Receive async event packet from firmware. Callee disposes of rxp. */ @@ -247,7 +244,6 @@ void brcmf_bus_add_txhdrlen(struct device *dev, uint len); #ifdef CONFIG_BRCMFMAC_SDIO void brcmf_sdio_exit(void); -void brcmf_sdio_init(void); void brcmf_sdio_register(void); #endif #ifdef CONFIG_BRCMFMAC_USB diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 729bf33..ec1171c 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -326,7 +326,7 @@ u16 channel_to_chanspec(struct brcmu_d11inf *d11inf, * triples, returning a pointer to the substring whose first element * matches tag */ -const struct brcmf_tlv * +static const struct brcmf_tlv * brcmf_parse_tlvs(const void *buf, int buflen, uint key) { const struct brcmf_tlv *elt = buf; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h index 0c9a708..8f19d95 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h @@ -396,8 +396,6 @@ void brcmf_free_vif(struct brcmf_cfg80211_vif *vif); s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag, const u8 *vndr_ie_buf, u32 vndr_ie_len); s32 brcmf_vif_clear_mgmt_ies(struct brcmf_cfg80211_vif *vif); -const struct brcmf_tlv * -brcmf_parse_tlvs(const void *buf, int buflen, uint key); u16 channel_to_chanspec(struct brcmu_d11inf *d11inf, struct ieee80211_channel *ch); bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg, -- 2.10.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] brcmfmac: move function declarations to proper headers 2017-01-17 16:34 [PATCH 1/2] brcmfmac: drop unneeded function declarations from headers Rafał Miłecki @ 2017-01-17 16:34 ` Rafał Miłecki 2017-01-18 8:58 ` Arend Van Spriel 2017-01-18 8:56 ` [PATCH 1/2] brcmfmac: drop unneeded function declarations from headers Arend Van Spriel 1 sibling, 1 reply; 6+ messages in thread From: Rafał Miłecki @ 2017-01-17 16:34 UTC (permalink / raw) To: Kalle Valo Cc: Arend van Spriel, Franky Lin, Hante Meuleman, Pieter-Paul Giesberts, Franky Lin, linux-wireless, brcm80211-dev-list.pdl, Rafał Miłecki From: Rafał Miłecki <rafal@milecki.pl> Function brcmf_c_set_joinpref_default is in common.c, so move it to the related header. All other (touched) ones are in core.c so take them out of the bus.h. I just needed to include bus.h to have enum brcmf_bus_state defined. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 28 ---------------------- .../wireless/broadcom/brcm80211/brcmfmac/common.h | 2 ++ .../wireless/broadcom/brcm80211/brcmfmac/core.h | 21 +++++++++++++++- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h index b5bb971..58a3de6 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h @@ -214,34 +214,6 @@ int brcmf_bus_get_memdump(struct brcmf_bus *bus, void *data, size_t len) return bus->ops->get_memdump(bus->dev, data, len); } -/* - * interface functions from common layer - */ - -/* Receive frame for delivery to OS. Callee disposes of rxp. */ -void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_event); -/* Receive async event packet from firmware. Callee disposes of rxp. */ -void brcmf_rx_event(struct device *dev, struct sk_buff *rxp); - -/* Indication from bus module regarding presence/insertion of dongle. */ -int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings); -/* Indication from bus module regarding removal/absence of dongle */ -void brcmf_detach(struct device *dev); -/* Indication from bus module that dongle should be reset */ -void brcmf_dev_reset(struct device *dev); -/* Indication from bus module to change flow-control state */ -void brcmf_txflowblock(struct device *dev, bool state); - -/* Notify the bus has transferred the tx packet to firmware */ -void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success); - -/* Configure the "global" bus state used by upper layers */ -void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state); - -int brcmf_bus_start(struct device *dev); -s32 brcmf_iovar_data_set(struct device *dev, char *name, void *data, u32 len); -void brcmf_bus_add_txhdrlen(struct device *dev, uint len); - #ifdef CONFIG_BRCMFMAC_SDIO void brcmf_sdio_exit(void); void brcmf_sdio_register(void); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h index bd095ab..a62f8e7 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h @@ -65,6 +65,8 @@ struct brcmf_mp_device { } bus; }; +void brcmf_c_set_joinpref_default(struct brcmf_if *ifp); + struct brcmf_mp_device *brcmf_get_module_param(struct device *dev, enum brcmf_bus_type bus_type, u32 chip, u32 chiprev); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h index c94dcab..d92beca 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h @@ -22,6 +22,7 @@ #define BRCMFMAC_CORE_H #include <net/cfg80211.h> +#include "bus.h" #include "fweh.h" #define TOE_TX_CSUM_OL 0x00000001 @@ -213,10 +214,28 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx, void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked); void brcmf_txflowblock_if(struct brcmf_if *ifp, enum brcmf_netif_stop_reason reason, bool state); +/* Indication from bus module to change flow-control state */ +void brcmf_txflowblock(struct device *dev, bool state); void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success); void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb); +/* Receive frame for delivery to OS. Callee disposes of rxp. */ +void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_event); +/* Receive async event packet from firmware. Callee disposes of rxp. */ +void brcmf_rx_event(struct device *dev, struct sk_buff *rxp); +/* Notify the bus has transferred the tx packet to firmware */ +void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success); void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on); -void brcmf_c_set_joinpref_default(struct brcmf_if *ifp); +/* Indication from bus module regarding presence/insertion of dongle. */ +int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings); +int brcmf_bus_start(struct device *dev); +void brcmf_bus_add_txhdrlen(struct device *dev, uint len); +/* Indication from bus module that dongle should be reset */ +void brcmf_dev_reset(struct device *dev); +/* Indication from bus module regarding removal/absence of dongle */ +void brcmf_detach(struct device *dev); +s32 brcmf_iovar_data_set(struct device *dev, char *name, void *data, u32 len); +/* Configure the "global" bus state used by upper layers */ +void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state); int __init brcmf_core_init(void); void __exit brcmf_core_exit(void); -- 2.10.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] brcmfmac: move function declarations to proper headers 2017-01-17 16:34 ` [PATCH 2/2] brcmfmac: move function declarations to proper headers Rafał Miłecki @ 2017-01-18 8:58 ` Arend Van Spriel 2017-01-18 9:06 ` Rafał Miłecki 0 siblings, 1 reply; 6+ messages in thread From: Arend Van Spriel @ 2017-01-18 8:58 UTC (permalink / raw) To: Rafał Miłecki, Kalle Valo Cc: Franky Lin, Hante Meuleman, Pieter-Paul Giesberts, Franky Lin, linux-wireless, brcm80211-dev-list.pdl, Rafał Miłecki On 17-1-2017 17:34, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > Function brcmf_c_set_joinpref_default is in common.c, so move it to the > related header. All other (touched) ones are in core.c so take them out > of the bus.h. > I just needed to include bus.h to have enum brcmf_bus_state defined. I prefer to keep the bus api in separate include file so please leave those. That leaves the move of brcmf_c_set_joinpref_default(). Please send a v2 and consider it acked by me. > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 28 ---------------------- > .../wireless/broadcom/brcm80211/brcmfmac/common.h | 2 ++ > .../wireless/broadcom/brcm80211/brcmfmac/core.h | 21 +++++++++++++++- > 3 files changed, 22 insertions(+), 29 deletions(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h > index b5bb971..58a3de6 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h > @@ -214,34 +214,6 @@ int brcmf_bus_get_memdump(struct brcmf_bus *bus, void *data, size_t len) > return bus->ops->get_memdump(bus->dev, data, len); > } > > -/* > - * interface functions from common layer > - */ > - > -/* Receive frame for delivery to OS. Callee disposes of rxp. */ > -void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_event); > -/* Receive async event packet from firmware. Callee disposes of rxp. */ > -void brcmf_rx_event(struct device *dev, struct sk_buff *rxp); > - > -/* Indication from bus module regarding presence/insertion of dongle. */ > -int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings); > -/* Indication from bus module regarding removal/absence of dongle */ > -void brcmf_detach(struct device *dev); > -/* Indication from bus module that dongle should be reset */ > -void brcmf_dev_reset(struct device *dev); > -/* Indication from bus module to change flow-control state */ > -void brcmf_txflowblock(struct device *dev, bool state); > - > -/* Notify the bus has transferred the tx packet to firmware */ > -void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success); > - > -/* Configure the "global" bus state used by upper layers */ > -void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state); > - > -int brcmf_bus_start(struct device *dev); > -s32 brcmf_iovar_data_set(struct device *dev, char *name, void *data, u32 len); > -void brcmf_bus_add_txhdrlen(struct device *dev, uint len); > - > #ifdef CONFIG_BRCMFMAC_SDIO > void brcmf_sdio_exit(void); > void brcmf_sdio_register(void); > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h > index bd095ab..a62f8e7 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h > @@ -65,6 +65,8 @@ struct brcmf_mp_device { > } bus; > }; > > +void brcmf_c_set_joinpref_default(struct brcmf_if *ifp); > + > struct brcmf_mp_device *brcmf_get_module_param(struct device *dev, > enum brcmf_bus_type bus_type, > u32 chip, u32 chiprev); > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h > index c94dcab..d92beca 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h > @@ -22,6 +22,7 @@ > #define BRCMFMAC_CORE_H > > #include <net/cfg80211.h> > +#include "bus.h" > #include "fweh.h" > > #define TOE_TX_CSUM_OL 0x00000001 > @@ -213,10 +214,28 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx, > void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked); > void brcmf_txflowblock_if(struct brcmf_if *ifp, > enum brcmf_netif_stop_reason reason, bool state); > +/* Indication from bus module to change flow-control state */ > +void brcmf_txflowblock(struct device *dev, bool state); > void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success); > void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb); > +/* Receive frame for delivery to OS. Callee disposes of rxp. */ > +void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_event); > +/* Receive async event packet from firmware. Callee disposes of rxp. */ > +void brcmf_rx_event(struct device *dev, struct sk_buff *rxp); > +/* Notify the bus has transferred the tx packet to firmware */ > +void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success); > void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on); > -void brcmf_c_set_joinpref_default(struct brcmf_if *ifp); > +/* Indication from bus module regarding presence/insertion of dongle. */ > +int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings); > +int brcmf_bus_start(struct device *dev); > +void brcmf_bus_add_txhdrlen(struct device *dev, uint len); > +/* Indication from bus module that dongle should be reset */ > +void brcmf_dev_reset(struct device *dev); > +/* Indication from bus module regarding removal/absence of dongle */ > +void brcmf_detach(struct device *dev); > +s32 brcmf_iovar_data_set(struct device *dev, char *name, void *data, u32 len); > +/* Configure the "global" bus state used by upper layers */ > +void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state); > int __init brcmf_core_init(void); > void __exit brcmf_core_exit(void); > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] brcmfmac: move function declarations to proper headers 2017-01-18 8:58 ` Arend Van Spriel @ 2017-01-18 9:06 ` Rafał Miłecki 2017-01-18 9:35 ` Arend Van Spriel 0 siblings, 1 reply; 6+ messages in thread From: Rafał Miłecki @ 2017-01-18 9:06 UTC (permalink / raw) To: Arend Van Spriel Cc: Kalle Valo, Franky Lin, Hante Meuleman, Pieter-Paul Giesberts, Franky Lin, linux-wireless@vger.kernel.org, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, Rafał Miłecki On 18 January 2017 at 09:58, Arend Van Spriel <arend.vanspriel@broadcom.com> wrote: > On 17-1-2017 17:34, Rafa=C5=82 Mi=C5=82ecki wrote: >> From: Rafa=C5=82 Mi=C5=82ecki <rafal@milecki.pl> >> >> Function brcmf_c_set_joinpref_default is in common.c, so move it to the >> related header. All other (touched) ones are in core.c so take them out >> of the bus.h. >> I just needed to include bus.h to have enum brcmf_bus_state defined. > > I prefer to keep the bus api in separate include file so please leave > those. That leaves the move of brcmf_c_set_joinpref_default(). Please > send a v2 and consider it acked by me. Oh, I just realized there isn't bus.c! Would that make sense to move these functions from core.c to new bus.c then? --=20 Rafa=C5=82 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] brcmfmac: move function declarations to proper headers 2017-01-18 9:06 ` Rafał Miłecki @ 2017-01-18 9:35 ` Arend Van Spriel 0 siblings, 0 replies; 6+ messages in thread From: Arend Van Spriel @ 2017-01-18 9:35 UTC (permalink / raw) To: Rafał Miłecki Cc: Kalle Valo, Franky Lin, Hante Meuleman, Pieter-Paul Giesberts, Franky Lin, linux-wireless@vger.kernel.org, open list:BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER, Rafał Miłecki On 18-1-2017 10:06, Rafał Miłecki wrote: > On 18 January 2017 at 09:58, Arend Van Spriel > <arend.vanspriel@broadcom.com> wrote: >> On 17-1-2017 17:34, Rafał Miłecki wrote: >>> From: Rafał Miłecki <rafal@milecki.pl> >>> >>> Function brcmf_c_set_joinpref_default is in common.c, so move it to the >>> related header. All other (touched) ones are in core.c so take them out >>> of the bus.h. >>> I just needed to include bus.h to have enum brcmf_bus_state defined. >> >> I prefer to keep the bus api in separate include file so please leave >> those. That leaves the move of brcmf_c_set_joinpref_default(). Please >> send a v2 and consider it acked by me. > > Oh, I just realized there isn't bus.c! Would that make sense to move > these functions from core.c to new bus.c then? I have no strong opinion about it. Right now it seems a bit overzealous, but I have been considering adding counters/statistics on bus layer so the amount of code may justify a separate source file. Regards, Arend ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] brcmfmac: drop unneeded function declarations from headers 2017-01-17 16:34 [PATCH 1/2] brcmfmac: drop unneeded function declarations from headers Rafał Miłecki 2017-01-17 16:34 ` [PATCH 2/2] brcmfmac: move function declarations to proper headers Rafał Miłecki @ 2017-01-18 8:56 ` Arend Van Spriel 1 sibling, 0 replies; 6+ messages in thread From: Arend Van Spriel @ 2017-01-18 8:56 UTC (permalink / raw) To: Rafał Miłecki, Kalle Valo Cc: Franky Lin, Hante Meuleman, Pieter-Paul Giesberts, Franky Lin, linux-wireless, brcm80211-dev-list.pdl, Rafał Miłecki On 17-1-2017 17:34, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > Functions brcmf_c_prec_enq and brcmf_sdio_init don't exist so we > really don't need their declarations. Function brcmf_parse_tlvs is used > in cfg80211.c only so make it static and drop from header as well. brcmf_c_prec_enq has been long gone (3.18 or so). Thanks for the cleanup. Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 4 ---- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h | 2 -- > 3 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h > index e21f760..b5bb971 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h > @@ -218,9 +218,6 @@ int brcmf_bus_get_memdump(struct brcmf_bus *bus, void *data, size_t len) > * interface functions from common layer > */ > > -bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, struct sk_buff *pkt, > - int prec); > - > /* Receive frame for delivery to OS. Callee disposes of rxp. */ > void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_event); > /* Receive async event packet from firmware. Callee disposes of rxp. */ > @@ -247,7 +244,6 @@ void brcmf_bus_add_txhdrlen(struct device *dev, uint len); > > #ifdef CONFIG_BRCMFMAC_SDIO > void brcmf_sdio_exit(void); > -void brcmf_sdio_init(void); > void brcmf_sdio_register(void); > #endif > #ifdef CONFIG_BRCMFMAC_USB > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c > index 729bf33..ec1171c 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c > @@ -326,7 +326,7 @@ u16 channel_to_chanspec(struct brcmu_d11inf *d11inf, > * triples, returning a pointer to the substring whose first element > * matches tag > */ > -const struct brcmf_tlv * > +static const struct brcmf_tlv * > brcmf_parse_tlvs(const void *buf, int buflen, uint key) > { > const struct brcmf_tlv *elt = buf; > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h > index 0c9a708..8f19d95 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h > @@ -396,8 +396,6 @@ void brcmf_free_vif(struct brcmf_cfg80211_vif *vif); > s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag, > const u8 *vndr_ie_buf, u32 vndr_ie_len); > s32 brcmf_vif_clear_mgmt_ies(struct brcmf_cfg80211_vif *vif); > -const struct brcmf_tlv * > -brcmf_parse_tlvs(const void *buf, int buflen, uint key); > u16 channel_to_chanspec(struct brcmu_d11inf *d11inf, > struct ieee80211_channel *ch); > bool brcmf_get_vif_state_any(struct brcmf_cfg80211_info *cfg, > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-18 9:42 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-01-17 16:34 [PATCH 1/2] brcmfmac: drop unneeded function declarations from headers Rafał Miłecki 2017-01-17 16:34 ` [PATCH 2/2] brcmfmac: move function declarations to proper headers Rafał Miłecki 2017-01-18 8:58 ` Arend Van Spriel 2017-01-18 9:06 ` Rafał Miłecki 2017-01-18 9:35 ` Arend Van Spriel 2017-01-18 8:56 ` [PATCH 1/2] brcmfmac: drop unneeded function declarations from headers Arend Van Spriel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox