brcmfmac: cleanup and chip workaround for unsecure AP
PATCH 2/12 brcmfmac: Remove copy mac address from drvr at netdev up.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
At netdev up the mac address from drvr is copied to netdev mac address. This is incorrect and mac address was already set by brcmf_net_attach by copying it from ifp.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +0 -2
@@ -567,8 +567,6 @@ static int brcmf_netdev_open(struct net_device *ndev)atomic_set (&drvr->pend_8021x_cnt,0 ); -memcpy (ndev->dev_addr, drvr->mac,ETH_ALEN ); -/* Get current TOE mode from dongle */ if (brcmf_fil_iovar_int_get (ifp,"toe_ol" , &toe_ol) >=0 && (toe_ol &TOE_TX_CSUM_OL ) !=0 )
Signature · 1 line
1.7.10.4
PATCH 3/12 brcmfmac: Use struct brcmf_if in brcmf_configure_opensecurity.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +2 -4
@@ -2968,9 +2968,8 @@ static int brcmf_cfg80211_testmode(struct wiphy *wiphy, void *data, int len) }#endif -static s32 brcmf_configure_opensecurity (struct net_device *ndev,s32 bssidx) +static s32 brcmf_configure_opensecurity (struct brcmf_if *ifp) { -struct brcmf_if *ifp =netdev_priv (ndev);s32 err;/* set auth */
@@ -3433,7 +3432,6 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,struct brcmf_tlv *rsn_ie;struct brcmf_vs_tlv *wpa_ie;struct brcmf_join_params join_params; -s32 bssidx =0 ; brcmf_dbg(TRACE, "channel_type=%d, beacon_interval=%d, dtim_period=%d,\n", cfg80211_get_chandef_type(&settings->chandef),
@@ -3507,7 +3505,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, } }else {brcmf_dbg (TRACE ,"No WPA(2) IEs found\n" ); -brcmf_configure_opensecurity (ndev, bssidx); +brcmf_configure_opensecurity (ifp); }/* Set Beacon IEs to FW */ err = brcmf_vif_set_mgmt_ie(ndev_to_vif(ndev),
Signature · 1 line
1.7.10.4
PATCH 5/12 brcmfmac: Add logging for FIL int set/get cmds.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
--- drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/fwil.c +2 -0
@@ -100,6 +100,7 @@ brcmf_fil_cmd_int_set(struct brcmf_if *ifp, u32 cmd, u32 data)__le32 data_le =cpu_to_le32 (data);mutex_lock (&ifp->drvr->proto_block); +brcmf_dbg (FIL ,"cmd=%d, value=%d\n" , cmd, data); err =brcmf_fil_cmd_data (ifp, cmd, &data_le,sizeof (data_le), true);mutex_unlock (&ifp->drvr->proto_block);
@@ -116,6 +117,7 @@ brcmf_fil_cmd_int_get(struct brcmf_if *ifp, u32 cmd, u32 *data) err =brcmf_fil_cmd_data (ifp, cmd, &data_le,sizeof (data_le), false);mutex_unlock (&ifp->drvr->proto_block); *data =le32_to_cpu (data_le); +brcmf_dbg (FIL ,"cmd=%d, value=%d\n" , cmd, *data);return err; }
Signature · 1 line
1.7.10.4
PATCH 6/12 brcmfmac: Track statistics per ifp.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Statistics were tracked by bus driver while it is to be tracked per ifp/netdev.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 13 ----- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 61 +++++++++----------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 10 ---- drivers/net/wireless/brcm80211/brcmfmac/usb.c | 9 +-- 4 files changed, 27 insertions(+), 66 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +0 -13
@@ -24,18 +24,6 @@ enum brcmf_bus_state {BRCMF_BUS_DATA /* Ready for frame transfers */ }; -struct dngl_stats { -unsigned long rx_packets;/* total packets received */ -unsigned long tx_packets;/* total packets transmitted */ -unsigned long rx_bytes;/* total bytes received */ -unsigned long tx_bytes;/* total bytes transmitted */ -unsigned long rx_errors;/* bad packets received */ -unsigned long tx_errors;/* packet transmit problems */ -unsigned long rx_dropped;/* packets dropped by dongle */ -unsigned long tx_dropped;/* packets dropped by dongle */ -unsigned long multicast;/* multicast packets received */ -}; -struct brcmf_bus_dcmd {char *name;char *param;
@@ -87,7 +75,6 @@ struct brcmf_bus {enum brcmf_bus_state state;uint maxctl;unsigned long tx_realloc; -struct dngl_stats dstats;u8 align;struct list_head dcmd_list;
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +26 -35
112 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +0 -10
@@ -1096,7 +1096,6 @@ static int brcmf_sdio_hdparser(struct brcmf_sdio *bus, u8 *header,if (len >MAX_RX_DATASZ && rd->channel !=SDPCM_CONTROL_CHANNEL && type !=BRCMF_SDIO_FT_SUPER ) {brcmf_err ("HW header length too long\n" ); - bus->sdiodev->bus_if->dstats.rx_errors++; bus->sdcnt.rx_toolong++;brcmf_sdbrcm_rxfail (bus, false, false); rd->len =0 ;
@@ -1298,7 +1297,6 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)if (errcode <0 ) {brcmf_err ("glom read of %d bytes failed: %d\n" , dlen, errcode); - bus->sdiodev->bus_if->dstats.rx_errors++;sdio_claim_host (bus->sdiodev->func[1 ]);if (bus->glomerr++ <3 ) {
@@ -1478,7 +1476,6 @@ brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)if ((rdlen +BRCMF_FIRSTREAD ) > bus->sdiodev->bus_if->maxctl) {brcmf_err ("%d-byte control read exceeds %d-byte buffer\n" , rdlen, bus->sdiodev->bus_if->maxctl); - bus->sdiodev->bus_if->dstats.rx_errors++;brcmf_sdbrcm_rxfail (bus, false, false); goto done; }
@@ -1486,7 +1483,6 @@ brcmf_sdbrcm_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff)if ((len - doff) > bus->sdiodev->bus_if->maxctl) {brcmf_err ("%d-byte ctl frame (%d-byte ctl data) exceeds %d-byte limit\n" , len, len - doff, bus->sdiodev->bus_if->maxctl); - bus->sdiodev->bus_if->dstats.rx_errors++; bus->sdcnt.rx_toolong++;brcmf_sdbrcm_rxfail (bus, false, false); goto done;
@@ -1634,7 +1630,6 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)if (!pkt) {/* Give up on data, request rtx of events */ brcmf_err ("brcmu_pkt_buf_get_skb failed\n" ); - bus->sdiodev->bus_if->dstats.rx_dropped++;brcmf_sdbrcm_rxfail (bus, false,RETRYCHAN (rd->channel));sdio_release_host (bus->sdiodev->func[1 ]);
@@ -1652,7 +1647,6 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)brcmf_err ("read %d bytes from channel %d failed: %d\n" , rd->len, rd->channel, sdret);brcmu_pkt_buf_free_skb (pkt); - bus->sdiodev->bus_if->dstats.rx_errors++;sdio_claim_host (bus->sdiodev->func[1 ]);brcmf_sdbrcm_rxfail (bus, true,RETRYCHAN (rd->channel));
@@ -1940,10 +1934,6 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes) datalen = pkt->len -SDPCM_HDRLEN ; ret =brcmf_sdbrcm_txpkt (bus, pkt,SDPCM_DATA_CHANNEL , true); -if (ret) - bus->sdiodev->bus_if->dstats.tx_errors++; -else - bus->sdiodev->bus_if->dstats.tx_bytes += datalen;/* In poll mode, need to check for other events */ if (!bus->intr && cnt) {
drivers/net/wireless/brcm80211/brcmfmac/usb.c +1 -8
@@ -421,10 +421,6 @@ static void brcmf_usb_tx_complete(struct urb *urb)brcmf_dbg (USB ,"Enter, urb->status=%d, skb=%p\n" , urb->status, req->skb);brcmf_usb_del_fromq (devinfo, req); -if (urb->status ==0 ) - devinfo->bus_pub.bus->dstats.tx_packets++; -else - devinfo->bus_pub.bus->dstats.tx_errors++;brcmf_txcomplete (devinfo->dev, req->skb, urb->status ==0 );
@@ -451,10 +447,7 @@ static void brcmf_usb_rx_complete(struct urb *urb) req->skb =NULL ;/* zero lenght packets indicate usb "failure". Do not refill */ -if (urb->status ==0 && urb->actual_length) { - devinfo->bus_pub.bus->dstats.rx_packets++; - }else { - devinfo->bus_pub.bus->dstats.rx_errors++; +if (urb->status !=0 || !urb->actual_length) {brcmu_pkt_buf_free_skb (skb);brcmf_usb_enq (devinfo, &devinfo->rx_freeq, req,NULL );return ;
Signature · 1 line
1.7.10.4
PATCH 11/12 brcmfmac: add function to retrieve chip information
In reply to Arend van SprielAdded function to obtain chip information for chip specific code.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 1 + drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 10 ++++++++++ 2 files changed, 11 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +1 -0
@@ -552,5 +552,6 @@ extern int brcmf_net_attach(struct brcmf_if *ifp);extern struct brcmf_if *brcmf_add_if (struct brcmf_pub *drvr,int ifidx,s32 bssidx,char *name,u8 *mac_addr);extern void brcmf_del_if (struct brcmf_pub *drvr,int ifidx); +extern u32 brcmf_get_chip_info (struct brcmf_if *ifp);#endif /* _BRCMF_H_ */
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +10 -0
@@ -895,6 +895,16 @@ int brcmf_netdev_wait_pend8021x(struct net_device *ndev)return !err; } +/* +* return chip id and rev of the device encoded in u32. +*/ +u32 brcmf_get_chip_info (struct brcmf_if *ifp) +{ +struct brcmf_bus *bus = ifp->drvr->bus_if; + +return bus->chip <<4 | bus->chiprev; +} +static void brcmf_driver_init (struct work_struct *work) {brcmf_debugfs_init ();
Signature · 1 line
1.7.10.4
PATCH 4/12 brcmfmac: Track pending 8021x frames per ifp.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Pending 8021x frames were tracked per dongle. This should be done per ifp.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 7 +++--- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 25 ++++++++++---------- 2 files changed, 17 insertions(+), 15 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +4 -3
@@ -489,9 +489,6 @@ struct brcmf_pub {struct mutex proto_block;unsigned char proto_buf[BRCMF_DCMD_MAXLEN ]; -atomic_t pend_8021x_cnt; -wait_queue_head_t pend_8021x_wait; -struct brcmf_fweh_info fweh;#ifdef DEBUG struct dentry *dbgfs_dir;
@@ -518,6 +515,8 @@ struct brcmf_cfg80211_vif;* @idx: interface index in device firmware. * @bssidx: index of bss associated with this interface. * @mac_addr: assigned mac address. +* @pend_8021x_cnt: tracks outstanding number of 802.1x frames. +* @pend_8021x_wait: used for signalling change in count. */ struct brcmf_if {struct brcmf_pub *drvr;
@@ -529,6 +528,8 @@ struct brcmf_if {int idx;s32 bssidx;u8 mac_addr[ETH_ALEN ]; +atomic_t pend_8021x_cnt; +wait_queue_head_t pend_8021x_wait; };
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +13 -12
@@ -217,7 +217,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,if (is_multicast_ether_addr (eh->h_dest)) drvr->tx_multicast++;if (ntohs (eh->h_proto) ==ETH_P_PAE ) -atomic_inc (&drvr->pend_8021x_cnt); +atomic_inc (&ifp->pend_8021x_cnt);/* If the protocol uses a data header, apply it */ brcmf_proto_hdrpush (drvr, ifp->idx, skb);
@@ -348,6 +348,7 @@ void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)u16 type;struct brcmf_bus *bus_if =dev_get_drvdata (dev);struct brcmf_pub *drvr = bus_if->drvr; +struct brcmf_if *ifp;brcmf_proto_hdrpull (drvr, &ifidx, txp);
@@ -355,9 +356,10 @@ void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success) type =ntohs (eh->h_proto);if (type ==ETH_P_PAE ) { -atomic_dec (&drvr->pend_8021x_cnt); -if (waitqueue_active (&drvr->pend_8021x_wait)) -wake_up (&drvr->pend_8021x_wait); + ifp = drvr->iflist[ifidx]; +atomic_dec (&ifp->pend_8021x_cnt); +if (waitqueue_active (&ifp->pend_8021x_wait)) +wake_up (&ifp->pend_8021x_wait); } }
@@ -565,7 +567,7 @@ static int brcmf_netdev_open(struct net_device *ndev)return -EAGAIN ; } -atomic_set (&drvr->pend_8021x_cnt,0 ); +atomic_set (&ifp->pend_8021x_cnt,0 );/* Get current TOE mode from dongle */ if (brcmf_fil_iovar_int_get(ifp, "toe_ol", &toe_ol) >= 0
@@ -686,6 +688,8 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, int ifidx, s32 bssidx,INIT_WORK (&ifp->setmacaddr_work, _brcmf_set_mac_address);INIT_WORK (&ifp->multicast_work, _brcmf_set_multicast_list); +init_waitqueue_head (&ifp->pend_8021x_wait); +if (addr_mask !=NULL )for (i =0 ; i <ETH_ALEN ; i++) ifp->mac_addr[i] = drvr->mac[i] ^ addr_mask[i];
@@ -763,8 +767,6 @@ int brcmf_attach(uint bus_hdrlen, struct device *dev)INIT_LIST_HEAD (&drvr->bus_if->dcmd_list); -init_waitqueue_head (&drvr->pend_8021x_wait); -return ret; fail:
@@ -879,19 +881,18 @@ void brcmf_detach(struct device *dev)kfree (drvr); } -static int brcmf_get_pend_8021x_cnt (struct brcmf_pub *drvr) +static int brcmf_get_pend_8021x_cnt (struct brcmf_if *ifp) { -return atomic_read (&drvr->pend_8021x_cnt); +return atomic_read (&ifp->pend_8021x_cnt); }int brcmf_netdev_wait_pend8021x (struct net_device *ndev) {struct brcmf_if *ifp =netdev_priv (ndev); -struct brcmf_pub *drvr = ifp->drvr;int err; - err =wait_event_timeout (drvr->pend_8021x_wait, - !brcmf_get_pend_8021x_cnt (drvr), + err =wait_event_timeout (ifp->pend_8021x_wait, + !brcmf_get_pend_8021x_cnt (ifp),msecs_to_jiffies (MAX_WAIT_FOR_8021X_TX ));WARN_ON (!err);
Signature · 1 line
1.7.10.4
PATCH 9/12 brcmfmac: Use single function for channel to chanspec.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Simplify code by using single function for converting channel to chanspec. No need to set 40MHz flags, as they are not needed for correct working in FW.
--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 63 +++++++------------- 1 file changed, 21 insertions(+), 42 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +21 -42
@@ -393,16 +393,9 @@ static u16 channel_to_chanspec(struct ieee80211_channel *ch)else chanspec |=WL_CHANSPEC_BAND_5G ; -if (ch->flags &IEEE80211_CHAN_NO_HT40 ) { - chanspec |=WL_CHANSPEC_BW_20 ; - chanspec |=WL_CHANSPEC_CTL_SB_NONE ; - }else { - chanspec |=WL_CHANSPEC_BW_40 ; -if (ch->flags &IEEE80211_CHAN_NO_HT40PLUS ) - chanspec |=WL_CHANSPEC_CTL_SB_LOWER ; -else - chanspec |=WL_CHANSPEC_CTL_SB_UPPER ; - } + chanspec |=WL_CHANSPEC_BW_20 ; + chanspec |=WL_CHANSPEC_CTL_SB_NONE ; +return chanspec; }
@@ -933,31 +926,6 @@ static void brcmf_init_prof(struct brcmf_cfg80211_profile *prof)memset (prof,0 ,sizeof (*prof)); } -static void brcmf_ch_to_chanspec (int ch,struct brcmf_join_params *join_params, -size_t *join_params_size) -{ -u16 chanspec =0 ; - -if (ch !=0 ) { -if (ch <=CH_MAX_2G_CHANNEL ) - chanspec |=WL_CHANSPEC_BAND_2G ; -else - chanspec |=WL_CHANSPEC_BAND_5G ; - - chanspec |=WL_CHANSPEC_BW_20 ; - chanspec |=WL_CHANSPEC_CTL_SB_NONE ; - - *join_params_size +=BRCMF_ASSOC_PARAMS_FIXED_SIZE + -sizeof (u16); - - chanspec |= (ch &WL_CHANSPEC_CHAN_MASK ); - join_params->params_le.chanspec_list[0 ] =cpu_to_le16 (chanspec); - join_params->params_le.chanspec_num =cpu_to_le32 (1 ); - -brcmf_dbg (CONN ,"channel %d, chanspec %#X\n" , ch, chanspec); - } -} -static void brcmf_link_down (struct brcmf_cfg80211_vif *vif) {s32 err =0 ;
@@ -988,6 +956,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,s32 err =0 ;s32 wsec =0 ;s32 bcnprd; +u16 chanspec;brcmf_dbg (TRACE ,"Enter\n" );if (!check_vif_up (ifp->vif))
@@ -1091,8 +1060,11 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev, params->chandef.chan->center_freq);if (params->channel_fixed) {/* adding chanspec */ -brcmf_ch_to_chanspec (cfg->channel, - &join_params, &join_params_size); + chanspec =channel_to_chanspec (params->chandef.chan); + join_params.params_le.chanspec_list[0 ] = +cpu_to_le16 (chanspec); + join_params.params_le.chanspec_num =cpu_to_le32 (1 ); + join_params_size +=sizeof (join_params.params_le); }/* set channel for starter */
@@ -1404,6 +1376,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,struct brcmf_join_params join_params;size_t join_params_size;struct brcmf_ssid ssid; +u16 chanspec;s32 err =0 ;
@@ -1421,10 +1394,13 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,if (chan) { cfg->channel =ieee80211_frequency_to_channel (chan->center_freq); -brcmf_dbg (CONN ,"channel (%d), center_req (%d)\n" , - cfg->channel, chan->center_freq); - }else + chanspec =channel_to_chanspec (chan); +brcmf_dbg (CONN ,"channel=%d, center_req=%d, chanspec=0x%04x\n" , + cfg->channel, chan->center_freq, chanspec); + }else { cfg->channel =0 ; + chanspec =0 ; + }brcmf_dbg (INFO ,"ie (%p), ie_len (%zd)\n" , sme->ie, sme->ie_len);
@@ -1473,8 +1449,11 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,brcmf_dbg (CONN ,"ssid \"%s\", len (%d)\n" , ssid.SSID, ssid.SSID_len); -brcmf_ch_to_chanspec (cfg->channel, - &join_params, &join_params_size); +if (cfg->channel) { + join_params.params_le.chanspec_list[0 ] =cpu_to_le16 (chanspec); + join_params.params_le.chanspec_num =cpu_to_le32 (1 ); + join_params_size +=sizeof (join_params.params_le); + } err =brcmf_fil_cmd_data_set (ifp,BRCMF_C_SET_SSID , &join_params, join_params_size);if (err)
Signature · 1 line
1.7.10.4
cover brcmfmac: cleanup and chip workaround for unsecure AP
Some cleanup items moving to interface oriented code to allow dealing with multiple interfaces, which is going to be needed soon.
Some other patches in this series fix connecting issues with an AP that is configured without security. Turns out the bcm43236 specifically needs this workaround.
This series is intended for v3.9 and applies to the wireless-next repository.
Arend van Spriel (3):
brcmfmac: add chip information to the bus interface
brcmfmac: add function to retrieve chip information
brcmfmac: fix problem connecting to AP without security
Hante Meuleman (9):
brcmfmac: Remove drvr_up from bus interface.
brcmfmac: Remove copy mac address from drvr at netdev up.
brcmfmac: Use struct brcmf_if in brcmf_configure_opensecurity.
brcmfmac: Track pending 8021x frames per ifp.
brcmfmac: Add logging for FIL int set/get cmds.
brcmfmac: Track statistics per ifp.
brcmfmac: Update tracelogging for multiple netdevs.
brcmfmac: Cleanup function brcmf_notifiy_connect_status_ap.
brcmfmac: Use single function for channel to chanspec.
drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 8 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 19 +-- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 142 +++++++++----------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 18 +-- drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 2 + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 11 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 111 +++++++-------- 7 files changed, 134 insertions(+), 177 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/12 brcmfmac: Remove drvr_up from bus interface.
From: Hante Meuleman <[email protected]>
The tracking of up/down status in bus interface is unnecessary.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 2 -- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 16 +--------------- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 6 +----- 3 files changed, 2 insertions(+), 22 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +0 -2
@@ -72,7 +72,6 @@ struct brcmf_bus_ops {* @drvr: public driver information. * @state: operational state of the bus interface. * @maxctl: maximum size for rxctl request message. -* @drvr_up: indicates driver up/down status. * @tx_realloc: number of tx packets realloced for headroom. * @dstats: dongle-based statistical data. * @align: alignment requirement for the bus.
@@ -87,7 +86,6 @@ struct brcmf_bus {struct brcmf_pub *drvr;enum brcmf_bus_state state;uint maxctl; -bool drvr_up;unsigned long tx_realloc;struct dngl_stats dstats;u8 align;
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +1 -15
@@ -452,13 +452,7 @@ static int brcmf_ethtool(struct brcmf_if *ifp, void __user *uaddr)sprintf (info.driver,"dhd" );strcpy (info.version,BRCMF_VERSION_STR ); } - -/* otherwise, require dongle to be up */ -else if (!drvr->bus_if->drvr_up) { -brcmf_err ("dongle is not up\n" ); -return -ENODEV ; - } -/* finally, report dongle driver type */ +/* report dongle driver type */ else sprintf (info.driver,"wl" );
@@ -545,18 +539,11 @@ static int brcmf_netdev_ioctl_entry(struct net_device *ndev, struct ifreq *ifr,static int brcmf_netdev_stop (struct net_device *ndev) { -struct brcmf_if *ifp =netdev_priv (ndev); -struct brcmf_pub *drvr = ifp->drvr; -brcmf_dbg (TRACE ,"Enter\n" ); -if (drvr->bus_if->drvr_up ==0 ) -return 0 ; -brcmf_cfg80211_down (ndev);/* Set state and stop OS transmissions */ - drvr->bus_if->drvr_up = false;netif_stop_queue (ndev);return 0 ;
@@ -591,7 +578,6 @@ static int brcmf_netdev_open(struct net_device *ndev)/* Allow transmit calls */ netif_start_queue (ndev); - drvr->bus_if->drvr_up = true;if (brcmf_cfg80211_up (ndev)) {brcmf_err ("failed to bring up cfg80211\n" );return -1 ;
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +1 -5
@@ -1962,8 +1962,7 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes) }/* Deflow-control stack if needed */ -if (bus->sdiodev->bus_if->drvr_up && - (bus->sdiodev->bus_if->state ==BRCMF_BUS_DATA ) && +if ((bus->sdiodev->bus_if->state ==BRCMF_BUS_DATA ) && bus->txoff && (pktq_len (&bus->txq) <TXLOW )) { bus->txoff = false;brcmf_txflowblock (bus->sdiodev->dev, false);
@@ -3308,9 +3307,6 @@ static int brcmf_sdbrcm_download_nvram(struct brcmf_sdio *bus) {int ret; -if (bus->sdiodev->bus_if->drvr_up) -return -EISCONN ; - ret =request_firmware (&bus->firmware,BRCMF_SDIO_NV_NAME , &bus->sdiodev->func[2 ]->dev);if (ret) {
Signature · 1 line
1.7.10.4
PATCH 7/12 brcmfmac: Update tracelogging for multiple netdevs.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
When supporting multiple netdevs it is usefull to log idx in netdev related functions. This will be used for features like P2P.
--- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 34 +++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +19 -15
@@ -70,9 +70,10 @@ static void _brcmf_set_multicast_list(struct work_struct *work)u32 buflen;s32 err; -brcmf_dbg (TRACE ,"enter\n" ); - ifp = container_of(work, struct brcmf_if, multicast_work); + +brcmf_dbg (TRACE ,"Enter, idx=%d\n" , ifp->idx); + ndev = ifp->ndev;/* Determine initial value of allmulti flag */
@@ -129,9 +130,10 @@ _brcmf_set_mac_address(struct work_struct *work)struct brcmf_if *ifp;s32 err; -brcmf_dbg (TRACE ,"enter\n" ); - ifp = container_of(work, struct brcmf_if, setmacaddr_work); + +brcmf_dbg (TRACE ,"Enter, idx=%d\n" , ifp->idx); + err =brcmf_fil_iovar_data_set (ifp,"cur_etheraddr" , ifp->mac_addr,ETH_ALEN );if (err <0 ) {
@@ -168,7 +170,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,struct brcmf_pub *drvr = ifp->drvr;struct ethhdr *eh; -brcmf_dbg (TRACE ,"Enter\n" ); +brcmf_dbg (TRACE ,"Enter, idx=%d\n" , ifp->idx);/* Can the device send data? */ if (drvr->bus_if->state !=BRCMF_BUS_DATA ) {
@@ -370,7 +372,7 @@ static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev) {struct brcmf_if *ifp =netdev_priv (ndev); -brcmf_dbg (TRACE ,"Enter\n" ); +brcmf_dbg (TRACE ,"Enter, idx=%d\n" , ifp->idx);return &ifp->stats; }
@@ -422,7 +424,7 @@ static int brcmf_ethtool(struct brcmf_if *ifp, void __user *uaddr)u32 toe_cmpnt, csum_dir;int ret; -brcmf_dbg (TRACE ,"Enter\n" ); +brcmf_dbg (TRACE ,"Enter, idx=%d\n" , ifp->idx);/* all ethtool calls start with a cmd word */ if (copy_from_user (&cmd, uaddr,sizeof (u32)))
@@ -519,7 +521,7 @@ static int brcmf_netdev_ioctl_entry(struct net_device *ndev, struct ifreq *ifr,struct brcmf_if *ifp =netdev_priv (ndev);struct brcmf_pub *drvr = ifp->drvr; -brcmf_dbg (TRACE ,"ifidx %d, cmd 0x%04x\n" , ifp->idx, cmd); +brcmf_dbg (TRACE ,"Enter, bssidx=%d, cmd=0x%04x\n" , ifp->idx, cmd);if (!drvr->iflist[ifp->idx])return -1 ;
@@ -532,7 +534,9 @@ static int brcmf_netdev_ioctl_entry(struct net_device *ndev, struct ifreq *ifr,static int brcmf_netdev_stop (struct net_device *ndev) { -brcmf_dbg (TRACE ,"Enter\n" ); +struct brcmf_if *ifp =netdev_priv (ndev); + +brcmf_dbg (TRACE ,"Enter, idx=%d\n" , ifp->idx);brcmf_cfg80211_down (ndev);
@@ -550,7 +554,7 @@ static int brcmf_netdev_open(struct net_device *ndev)u32 toe_ol;s32 ret =0 ; -brcmf_dbg (TRACE ,"ifidx %d\n" , ifp->idx); +brcmf_dbg (TRACE ,"Enter, idx=%d\n" , ifp->idx);/* If bus is not ready, can't continue */ if (bus_if->state !=BRCMF_BUS_DATA ) {
@@ -602,7 +606,8 @@ int brcmf_net_attach(struct brcmf_if *ifp)struct brcmf_pub *drvr = ifp->drvr;struct net_device *ndev; -brcmf_dbg (TRACE ,"ifidx %d mac %pM\n" , ifp->idx, ifp->mac_addr); +brcmf_dbg (TRACE ,"Enter, idx=%d mac=%pM\n" , ifp->idx, + ifp->mac_addr); ndev = ifp->ndev;/* set appropriate operations */
@@ -641,7 +646,7 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, int ifidx, s32 bssidx,struct net_device *ndev;int i; -brcmf_dbg (TRACE ,"idx %d\n" , ifidx); +brcmf_dbg (TRACE ,"Enter, bssidx=%d, ifidx=%d\n" , bssidx, ifidx); ifp = drvr->iflist[ifidx];/*
@@ -695,13 +700,12 @@ void brcmf_del_if(struct brcmf_pub *drvr, int ifidx) {struct brcmf_if *ifp; -brcmf_dbg (TRACE ,"idx %d\n" , ifidx); - ifp = drvr->iflist[ifidx];if (!ifp) { -brcmf_err ("Null interface\n" ); +brcmf_err ("Null interface, idx=%d\n" , ifidx);return ; } +brcmf_dbg (TRACE ,"Enter, idx=%d, bssidx=%d\n" , ifidx, ifp->bssidx);if (ifp->ndev) {if (ifidx ==0 ) {if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {
Signature · 1 line
1.7.10.4
PATCH 10/12 brcmfmac: add chip information to the bus interface
In reply to Arend van SprielExtend the bus interface with chip identifier and revision. This will be used when certain devices need special handling in the driver.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 4 ++++ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 2 ++ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 2 ++ 3 files changed, 8 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h +4 -0
@@ -64,6 +64,8 @@ struct brcmf_bus_ops {* @dstats: dongle-based statistical data. * @align: alignment requirement for the bus. * @dcmd_list: bus/device specific dongle initialization commands. +* @chip: device identifier of the dongle chip. +* @chiprev: revision of the dongle chip. */ struct brcmf_bus { union {
@@ -76,6 +78,8 @@ struct brcmf_bus {uint maxctl;unsigned long tx_realloc;u8 align; +u32 chip; +u32 chiprev;struct list_head dcmd_list;struct brcmf_bus_ops *ops;
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +2 -0
@@ -3927,6 +3927,8 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)/* Assign bus interface call back */ bus->sdiodev->bus_if->dev = bus->sdiodev->dev; bus->sdiodev->bus_if->ops = &brcmf_sdio_bus_ops; + bus->sdiodev->bus_if->chip = bus->ci->chip; + bus->sdiodev->bus_if->chiprev = bus->ci->chiprev;/* Attach to the brcmf/OS/network interface */ ret =brcmf_attach (SDPCM_RESERVE , bus->sdiodev->dev);
drivers/net/wireless/brcm80211/brcmfmac/usb.c +2 -0
@@ -1250,6 +1250,8 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo) bus->bus_priv.usb = bus_pub;dev_set_drvdata (dev, bus); bus->ops = &brcmf_usb_bus_ops; + bus->chip = bus_pub->devid; + bus->chiprev = bus_pub->chiprev;/* Attach to the common driver interface */ ret =brcmf_attach (0 , dev);
Signature · 1 line
1.7.10.4
PATCH 12/12 brcmfmac: fix problem connecting to AP without security
In reply to Arend van SprielThe bcm43236 device showed having an issue connection to an AP without security when auth_type was set to automatic. For this particular device a workaround is made by selecting open-system. This problem does not occur when using wpa_supplicant as it will not use auth type automatic.
--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 22 +++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +21 -1
@@ -1365,9 +1365,28 @@ brcmf_set_sharedkey(struct net_device *ndev,return err; } +static +enum nl80211_auth_type brcmf_war_auth_type (struct brcmf_if *ifp, +enum nl80211_auth_type type) +{ +u32 ci; +if (type ==NL80211_AUTHTYPE_AUTOMATIC ) { +/* shift to ignore chip revision */ + ci =brcmf_get_chip_info (ifp) >>4 ; +switch (ci) { +case 43236 : +brcmf_dbg (CONN ,"43236 WAR: use OPEN instead of AUTO\n" ); +return NL80211_AUTHTYPE_OPEN_SYSTEM ; +default : +break ; + } + } +return type; +} +static s32 brcmf_cfg80211_connect (struct wiphy *wiphy,struct net_device *ndev, -struct cfg80211_connect_params *sme) +struct cfg80211_connect_params *sme) {struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy);struct brcmf_if *ifp =netdev_priv (ndev);
@@ -1410,6 +1429,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev, goto done; } + sme->auth_type =brcmf_war_auth_type (ifp, sme->auth_type); err =brcmf_set_auth_type (ndev, sme);if (err) {brcmf_err ("wl_set_auth_type failed (%d)\n" , err);
Signature · 1 line
1.7.10.4
PATCH 8/12 brcmfmac: Cleanup function brcmf_notifiy_connect_status_ap.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Clean up function, removing some unnecessary code and initialisation.
--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +7 -13
@@ -3994,38 +3994,32 @@ brcmf_notify_connect_status_ap(struct brcmf_cfg80211_info *cfg,struct net_device *ndev, const struct brcmf_event_msg *e, void *data) { - s32 err = 0; + static int generation;u32 event = e->event_code;u32 reason = e->reason; -u32 len = e->datalen; -static int generation; -struct station_info sinfo;brcmf_dbg (CONN ,"event %d, reason %d\n" , event, reason); -memset (&sinfo,0 ,sizeof (sinfo)); - sinfo.filled =0 ;if (((event ==BRCMF_E_ASSOC_IND ) || (event ==BRCMF_E_REASSOC_IND )) && - reason ==BRCMF_E_STATUS_SUCCESS ) { + (reason ==BRCMF_E_STATUS_SUCCESS )) { +memset (&sinfo,0 ,sizeof (sinfo)); sinfo.filled =STATION_INFO_ASSOC_REQ_IES ;if (!data) {brcmf_err ("No IEs present in ASSOC/REASSOC_IND" );return -EINVAL ; } sinfo.assoc_req_ies = data; - sinfo.assoc_req_ies_len = len; + sinfo.assoc_req_ies_len = e->datalen; generation++; sinfo.generation = generation; -cfg80211_new_sta (ndev, e->addr, &sinfo,GFP_ATOMIC ); +cfg80211_new_sta (ndev, e->addr, &sinfo,GFP_KERNEL ); }else if ((event ==BRCMF_E_DISASSOC_IND ) || (event ==BRCMF_E_DEAUTH_IND ) || (event ==BRCMF_E_DEAUTH )) { - generation++; - sinfo.generation = generation; -cfg80211_del_sta (ndev, e->addr,GFP_ATOMIC ); +cfg80211_del_sta (ndev, e->addr,GFP_KERNEL ); } -return err; +return 0 ; } static s32
Signature · 1 line
1.7.10.4