package/kernel/mac80211/patches/374-0007-brcmfmac-Use-consistent-naming-for-bsscfgidx.patch

   1 From: Hante Meuleman <meuleman@broadcom.com>
   2 Date: Thu, 29 Oct 2015 20:33:17 +0100
   3 Subject: [PATCH] brcmfmac: Use consistent naming for bsscfgidx.
   4
   5 The variable bsscfgidx is used in different places with different
   6 names, e.g. bsscfg, bssidx, bsscfg_idx. This patch cleans this up
   7 by using bsscfgidx everywhere.
   8
   9 Reviewed-by: Arend Van Spriel <arend@broadcom.com>
  10 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  11 Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
  12 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14 ---
  15
  16 --- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
  17 +++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
  18 @@ -775,7 +775,8 @@ brcmf_cfg80211_change_iface(struct wiphy
  19         s32 ap = 0;
  20         s32 err = 0;
  21
  22 -       brcmf_dbg(TRACE, "Enter, idx=%d, type=%d\n", ifp->bssidx, type);
  23 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, type=%d\n", ifp->bsscfgidx,
  24 +                 type);
  25
  26         /* WAR: There are a number of p2p interface related problems which
  27          * need to be handled initially (before doing the validate).
  28 @@ -2920,7 +2921,7 @@ brcmf_cfg80211_escan_handler(struct brcm
  29         status = e->status;
  30
  31         if (!test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status)) {
  32 -               brcmf_err("scan not ready, bssidx=%d\n", ifp->bssidx);
  33 +               brcmf_err("scan not ready, bsscfgidx=%d\n", ifp->bsscfgidx);
  34                 return -EPERM;
  35         }
  36
  37 @@ -3876,7 +3877,8 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_c
  38         ifp = vif->ifp;
  39         saved_ie = &vif->saved_ie;
  40
  41 -       brcmf_dbg(TRACE, "bssidx %d, pktflag : 0x%02X\n", ifp->bssidx, pktflag);
  42 +       brcmf_dbg(TRACE, "bsscfgidx %d, pktflag : 0x%02X\n", ifp->bsscfgidx,
  43 +                 pktflag);
  44         iovar_ie_buf = kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL);
  45         if (!iovar_ie_buf)
  46                 return -ENOMEM;
  47 @@ -4240,7 +4242,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
  48                         brcmf_err("setting ssid failed %d\n", err);
  49                         goto exit;
  50                 }
  51 -               bss_enable.bsscfg_idx = cpu_to_le32(ifp->bssidx);
  52 +               bss_enable.bsscfgidx = cpu_to_le32(ifp->bsscfgidx);
  53                 bss_enable.enable = cpu_to_le32(1);
  54                 err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
  55                                                sizeof(bss_enable));
  56 @@ -4307,7 +4309,7 @@ static int brcmf_cfg80211_stop_ap(struct
  57                 if (err < 0)
  58                         brcmf_err("BRCMF_C_UP error %d\n", err);
  59         } else {
  60 -               bss_enable.bsscfg_idx = cpu_to_le32(ifp->bssidx);
  61 +               bss_enable.bsscfgidx = cpu_to_le32(ifp->bsscfgidx);
  62                 bss_enable.enable = cpu_to_le32(0);
  63                 err = brcmf_fil_iovar_data_set(ifp, "bss", &bss_enable,
  64                                                sizeof(bss_enable));
  65 @@ -5093,9 +5095,9 @@ static s32 brcmf_notify_vif_event(struct
  66         struct brcmf_cfg80211_vif_event *event = &cfg->vif_event;
  67         struct brcmf_cfg80211_vif *vif;
  68
  69 -       brcmf_dbg(TRACE, "Enter: action %u flags %u ifidx %u bsscfg %u\n",
  70 +       brcmf_dbg(TRACE, "Enter: action %u flags %u ifidx %u bsscfgidx %u\n",
  71                   ifevent->action, ifevent->flags, ifevent->ifidx,
  72 -                 ifevent->bssidx);
  73 +                 ifevent->bsscfgidx);
  74
  75         mutex_lock(&event->vif_event_lock);
  76         event->action = ifevent->action;
  77 --- a/drivers/net/wireless/brcm80211/brcmfmac/core.c
  78 +++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c
  79 @@ -80,7 +80,7 @@ char *brcmf_ifname(struct brcmf_if *ifp)
  80  struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx)
  81  {
  82         struct brcmf_if *ifp;
  83 -       s32 bssidx;
  84 +       s32 bsscfgidx;
  85
  86         if (ifidx < 0 || ifidx >= BRCMF_MAX_IFS) {
  87                 brcmf_err("ifidx %d out of range\n", ifidx);
  88 @@ -88,9 +88,9 @@ struct brcmf_if *brcmf_get_ifp(struct br
  89         }
  90
  91         ifp = NULL;
  92 -       bssidx = drvr->if2bss[ifidx];
  93 -       if (bssidx >= 0)
  94 -               ifp = drvr->iflist[bssidx];
  95 +       bsscfgidx = drvr->if2bss[ifidx];
  96 +       if (bsscfgidx >= 0)
  97 +               ifp = drvr->iflist[bsscfgidx];
  98
  99         return ifp;
 100  }
 101 @@ -108,7 +108,7 @@ static void _brcmf_set_multicast_list(st
 102
 103         ifp = container_of(work, struct brcmf_if, multicast_work);
 104
 105 -       brcmf_dbg(TRACE, "Enter, idx=%d\n", ifp->bssidx);
 106 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
 107
 108         ndev = ifp->ndev;
 109
 110 @@ -168,7 +168,7 @@ _brcmf_set_mac_address(struct work_struc
 111
 112         ifp = container_of(work, struct brcmf_if, setmacaddr_work);
 113
 114 -       brcmf_dbg(TRACE, "Enter, idx=%d\n", ifp->bssidx);
 115 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
 116
 117         err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", ifp->mac_addr,
 118                                        ETH_ALEN);
 119 @@ -206,7 +206,7 @@ static netdev_tx_t brcmf_netdev_start_xm
 120         struct brcmf_pub *drvr = ifp->drvr;
 121         struct ethhdr *eh = (struct ethhdr *)(skb->data);
 122
 123 -       brcmf_dbg(DATA, "Enter, idx=%d\n", ifp->bssidx);
 124 +       brcmf_dbg(DATA, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
 125
 126         /* Can the device send data? */
 127         if (drvr->bus_if->state != BRCMF_BUS_UP) {
 128 @@ -267,8 +267,8 @@ void brcmf_txflowblock_if(struct brcmf_i
 129         if (!ifp || !ifp->ndev)
 130                 return;
 131
 132 -       brcmf_dbg(TRACE, "enter: idx=%d stop=0x%X reason=%d state=%d\n",
 133 -                 ifp->bssidx, ifp->netif_stop, reason, state);
 134 +       brcmf_dbg(TRACE, "enter: bsscfgidx=%d stop=0x%X reason=%d state=%d\n",
 135 +                 ifp->bsscfgidx, ifp->netif_stop, reason, state);
 136
 137         spin_lock_irqsave(&ifp->netif_stop_lock, flags);
 138         if (state) {
 139 @@ -587,7 +587,7 @@ static struct net_device_stats *brcmf_ne
 140  {
 141         struct brcmf_if *ifp = netdev_priv(ndev);
 142
 143 -       brcmf_dbg(TRACE, "Enter, idx=%d\n", ifp->bssidx);
 144 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
 145
 146         return &ifp->stats;
 147  }
 148 @@ -616,7 +616,7 @@ static int brcmf_netdev_stop(struct net_
 149  {
 150         struct brcmf_if *ifp = netdev_priv(ndev);
 151
 152 -       brcmf_dbg(TRACE, "Enter, idx=%d\n", ifp->bssidx);
 153 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
 154
 155         brcmf_cfg80211_down(ndev);
 156
 157 @@ -632,7 +632,7 @@ static int brcmf_netdev_open(struct net_
 158         struct brcmf_bus *bus_if = drvr->bus_if;
 159         u32 toe_ol;
 160
 161 -       brcmf_dbg(TRACE, "Enter, idx=%d\n", ifp->bssidx);
 162 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
 163
 164         /* If bus is not ready, can't continue */
 165         if (bus_if->state != BRCMF_BUS_UP) {
 166 @@ -674,7 +674,7 @@ int brcmf_net_attach(struct brcmf_if *if
 167         struct net_device *ndev;
 168         s32 err;
 169
 170 -       brcmf_dbg(TRACE, "Enter, idx=%d mac=%pM\n", ifp->bssidx,
 171 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d mac=%pM\n", ifp->bsscfgidx,
 172                   ifp->mac_addr);
 173         ndev = ifp->ndev;
 174
 175 @@ -706,7 +706,7 @@ int brcmf_net_attach(struct brcmf_if *if
 176         return 0;
 177
 178  fail:
 179 -       drvr->iflist[ifp->bssidx] = NULL;
 180 +       drvr->iflist[ifp->bsscfgidx] = NULL;
 181         ndev->netdev_ops = NULL;
 182         free_netdev(ndev);
 183         return -EBADE;
 184 @@ -724,7 +724,8 @@ void brcmf_net_setcarrier(struct brcmf_i
 185  {
 186         struct net_device *ndev;
 187
 188 -       brcmf_dbg(TRACE, "Enter, idx=%d carrier=%d\n", ifp->bssidx, on);
 189 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d carrier=%d\n", ifp->bsscfgidx,
 190 +                 on);
 191
 192         ndev = ifp->ndev;
 193         brcmf_txflowblock_if(ifp, BRCMF_NETIF_STOP_REASON_DISCONNECTED, !on);
 194 @@ -771,7 +772,7 @@ static int brcmf_net_p2p_attach(struct b
 195  {
 196         struct net_device *ndev;
 197
 198 -       brcmf_dbg(TRACE, "Enter, idx=%d mac=%pM\n", ifp->bssidx,
 199 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d mac=%pM\n", ifp->bsscfgidx,
 200                   ifp->mac_addr);
 201         ndev = ifp->ndev;
 202
 203 @@ -790,21 +791,21 @@ static int brcmf_net_p2p_attach(struct b
 204         return 0;
 205
 206  fail:
 207 -       ifp->drvr->iflist[ifp->bssidx] = NULL;
 208 +       ifp->drvr->iflist[ifp->bsscfgidx] = NULL;
 209         ndev->netdev_ops = NULL;
 210         free_netdev(ndev);
 211         return -EBADE;
 212  }
 213
 214 -struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx,
 215 +struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
 216                               bool is_p2pdev, char *name, u8 *mac_addr)
 217  {
 218         struct brcmf_if *ifp;
 219         struct net_device *ndev;
 220
 221 -       brcmf_dbg(TRACE, "Enter, idx=%d, ifidx=%d\n", bssidx, ifidx);
 222 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", bsscfgidx, ifidx);
 223
 224 -       ifp = drvr->iflist[bssidx];
 225 +       ifp = drvr->iflist[bsscfgidx];
 226         /*
 227          * Delete the existing interface before overwriting it
 228          * in case we missed the BRCMF_E_IF_DEL event.
 229 @@ -815,7 +816,7 @@ struct brcmf_if *brcmf_add_if(struct brc
 230                 if (ifidx) {
 231                         netif_stop_queue(ifp->ndev);
 232                         brcmf_net_detach(ifp->ndev);
 233 -                       drvr->iflist[bssidx] = NULL;
 234 +                       drvr->iflist[bsscfgidx] = NULL;
 235                 } else {
 236                         brcmf_err("ignore IF event\n");
 237                         return ERR_PTR(-EINVAL);
 238 @@ -839,15 +840,15 @@ struct brcmf_if *brcmf_add_if(struct brc
 239                 ndev->destructor = brcmf_cfg80211_free_netdev;
 240                 ifp = netdev_priv(ndev);
 241                 ifp->ndev = ndev;
 242 -               /* store mapping ifidx to bssidx */
 243 +               /* store mapping ifidx to bsscfgidx */
 244                 if (drvr->if2bss[ifidx] == BRCMF_BSSIDX_INVALID)
 245 -                       drvr->if2bss[ifidx] = bssidx;
 246 +                       drvr->if2bss[ifidx] = bsscfgidx;
 247         }
 248
 249         ifp->drvr = drvr;
 250 -       drvr->iflist[bssidx] = ifp;
 251 +       drvr->iflist[bsscfgidx] = ifp;
 252         ifp->ifidx = ifidx;
 253 -       ifp->bssidx = bssidx;
 254 +       ifp->bsscfgidx = bsscfgidx;
 255
 256         init_waitqueue_head(&ifp->pend_8021x_wait);
 257         spin_lock_init(&ifp->netif_stop_lock);
 258 @@ -861,21 +862,22 @@ struct brcmf_if *brcmf_add_if(struct brc
 259         return ifp;
 260  }
 261
 262 -static void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx)
 263 +static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx)
 264  {
 265         struct brcmf_if *ifp;
 266
 267 -       ifp = drvr->iflist[bssidx];
 268 -       drvr->iflist[bssidx] = NULL;
 269 +       ifp = drvr->iflist[bsscfgidx];
 270 +       drvr->iflist[bsscfgidx] = NULL;
 271         if (!ifp) {
 272 -               brcmf_err("Null interface, idx=%d\n", bssidx);
 273 +               brcmf_err("Null interface, bsscfgidx=%d\n", bsscfgidx);
 274                 return;
 275         }
 276 -       brcmf_dbg(TRACE, "Enter, idx=%d, ifidx=%d\n", bssidx, ifp->ifidx);
 277 -       if (drvr->if2bss[ifp->ifidx] == bssidx)
 278 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", bsscfgidx,
 279 +                 ifp->ifidx);
 280 +       if (drvr->if2bss[ifp->ifidx] == bsscfgidx)
 281                 drvr->if2bss[ifp->ifidx] = BRCMF_BSSIDX_INVALID;
 282         if (ifp->ndev) {
 283 -               if (bssidx == 0) {
 284 +               if (bsscfgidx == 0) {
 285                         if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {
 286                                 rtnl_lock();
 287                                 brcmf_netdev_stop(ifp->ndev);
 288 @@ -905,12 +907,12 @@ static void brcmf_del_if(struct brcmf_pu
 289
 290  void brcmf_remove_interface(struct brcmf_if *ifp)
 291  {
 292 -       if (!ifp || WARN_ON(ifp->drvr->iflist[ifp->bssidx] != ifp))
 293 +       if (!ifp || WARN_ON(ifp->drvr->iflist[ifp->bsscfgidx] != ifp))
 294                 return;
 295 -       brcmf_dbg(TRACE, "Enter, bssidx=%d, ifidx=%d\n", ifp->bssidx,
 296 +       brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", ifp->bsscfgidx,
 297                   ifp->ifidx);
 298         brcmf_fws_del_interface(ifp);
 299 -       brcmf_del_if(ifp->drvr, ifp->bssidx);
 300 +       brcmf_del_if(ifp->drvr, ifp->bsscfgidx);
 301  }
 302
 303  int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr)
 304 @@ -925,10 +927,10 @@ int brcmf_get_next_free_bsscfgidx(struct
 305         highest = 2;
 306         for (ifidx = 0; ifidx < BRCMF_MAX_IFS; ifidx++) {
 307                 if (drvr->iflist[ifidx]) {
 308 -                       if (drvr->iflist[ifidx]->bssidx == bsscfgidx)
 309 +                       if (drvr->iflist[ifidx]->bsscfgidx == bsscfgidx)
 310                                 bsscfgidx = highest + 1;
 311 -                       else if (drvr->iflist[ifidx]->bssidx > highest)
 312 -                               highest = drvr->iflist[ifidx]->bssidx;
 313 +                       else if (drvr->iflist[ifidx]->bsscfgidx > highest)
 314 +                               highest = drvr->iflist[ifidx]->bsscfgidx;
 315                 } else {
 316                         available = true;
 317                 }
 318 --- a/drivers/net/wireless/brcm80211/brcmfmac/core.h
 319 +++ b/drivers/net/wireless/brcm80211/brcmfmac/core.h
 320 @@ -174,7 +174,7 @@ enum brcmf_netif_stop_reason {
 321   * @multicast_work: worker object for multicast provisioning.
 322   * @fws_desc: interface specific firmware-signalling descriptor.
 323   * @ifidx: interface index in device firmware.
 324 - * @bssidx: index of bss associated with this interface.
 325 + * @bsscfgidx: index of bss associated with this interface.
 326   * @mac_addr: assigned mac address.
 327   * @netif_stop: bitmap indicates reason why netif queues are stopped.
 328   * @netif_stop_lock: spinlock for update netif_stop from multiple sources.
 329 @@ -190,7 +190,7 @@ struct brcmf_if {
 330         struct work_struct multicast_work;
 331         struct brcmf_fws_mac_descriptor *fws_desc;
 332         int ifidx;
 333 -       s32 bssidx;
 334 +       s32 bsscfgidx;
 335         u8 mac_addr[ETH_ALEN];
 336         u8 netif_stop;
 337         spinlock_t netif_stop_lock;
 338 @@ -208,7 +208,7 @@ int brcmf_netdev_wait_pend8021x(struct b
 339  char *brcmf_ifname(struct brcmf_if *ifp);
 340  struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx);
 341  int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
 342 -struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx,
 343 +struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
 344                               bool is_p2pdev, char *name, u8 *mac_addr);
 345  void brcmf_remove_interface(struct brcmf_if *ifp);
 346  int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr);
 347 --- a/drivers/net/wireless/brcm80211/brcmfmac/debug.c
 348 +++ b/drivers/net/wireless/brcm80211/brcmfmac/debug.c
 349 @@ -49,7 +49,7 @@ static int brcmf_debug_psm_watchdog_noti
 350                                            const struct brcmf_event_msg *evtmsg,
 351                                            void *data)
 352  {
 353 -       brcmf_dbg(TRACE, "enter: idx=%d\n", ifp->bssidx);
 354 +       brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);
 355
 356         return brcmf_debug_create_memdump(ifp->drvr->bus_if, data,
 357                                           evtmsg->datalen);
 358 --- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
 359 +++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
 360 @@ -182,8 +182,8 @@ static void brcmf_fweh_handle_if_event(s
 361         bool is_p2pdev;
 362         int err = 0;
 363
 364 -       brcmf_dbg(EVENT, "action: %u idx: %u bsscfg: %u flags: %u role: %u\n",
 365 -                 ifevent->action, ifevent->ifidx, ifevent->bssidx,
 366 +       brcmf_dbg(EVENT, "action: %u ifidx: %u bsscfgidx: %u flags: %u role: %u\n",
 367 +                 ifevent->action, ifevent->ifidx, ifevent->bsscfgidx,
 368                   ifevent->flags, ifevent->role);
 369
 370         /* The P2P Device interface event must not be ignored contrary to what
 371 @@ -204,12 +204,12 @@ static void brcmf_fweh_handle_if_event(s
 372                 return;
 373         }
 374
 375 -       ifp = drvr->iflist[ifevent->bssidx];
 376 +       ifp = drvr->iflist[ifevent->bsscfgidx];
 377
 378         if (ifevent->action == BRCMF_E_IF_ADD) {
 379                 brcmf_dbg(EVENT, "adding %s (%pM)\n", emsg->ifname,
 380                           emsg->addr);
 381 -               ifp = brcmf_add_if(drvr, ifevent->bssidx, ifevent->ifidx,
 382 +               ifp = brcmf_add_if(drvr, ifevent->bsscfgidx, ifevent->ifidx,
 383                                    is_p2pdev, emsg->ifname, emsg->addr);
 384                 if (IS_ERR(ifp))
 385                         return;
 386 --- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
 387 +++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.h
 388 @@ -219,7 +219,7 @@ struct brcmf_if_event {
 389         u8 ifidx;
 390         u8 action;
 391         u8 flags;
 392 -       u8 bssidx;
 393 +       u8 bsscfgidx;
 394         u8 role;
 395  };
 396
 397 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
 398 +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c
 399 @@ -293,22 +293,22 @@ brcmf_fil_iovar_int_get(struct brcmf_if
 400  }
 401
 402  static u32
 403 -brcmf_create_bsscfg(s32 bssidx, char *name, char *data, u32 datalen, char *buf,
 404 -                   u32 buflen)
 405 +brcmf_create_bsscfg(s32 bsscfgidx, char *name, char *data, u32 datalen,
 406 +                   char *buf, u32 buflen)
 407  {
 408         const s8 *prefix = "bsscfg:";
 409         s8 *p;
 410         u32 prefixlen;
 411         u32 namelen;
 412         u32 iolen;
 413 -       __le32 bssidx_le;
 414 +       __le32 bsscfgidx_le;
 415
 416 -       if (bssidx == 0)
 417 +       if (bsscfgidx == 0)
 418                 return brcmf_create_iovar(name, data, datalen, buf, buflen);
 419
 420         prefixlen = strlen(prefix);
 421         namelen = strlen(name) + 1; /* lengh of iovar  name + null */
 422 -       iolen = prefixlen + namelen + sizeof(bssidx_le) + datalen;
 423 +       iolen = prefixlen + namelen + sizeof(bsscfgidx_le) + datalen;
 424
 425         if (buflen < iolen) {
 426                 brcmf_err("buffer is too short\n");
 427 @@ -326,9 +326,9 @@ brcmf_create_bsscfg(s32 bssidx, char *na
 428         p += namelen;
 429
 430         /* bss config index as first data */
 431 -       bssidx_le = cpu_to_le32(bssidx);
 432 -       memcpy(p, &bssidx_le, sizeof(bssidx_le));
 433 -       p += sizeof(bssidx_le);
 434 +       bsscfgidx_le = cpu_to_le32(bsscfgidx);
 435 +       memcpy(p, &bsscfgidx_le, sizeof(bsscfgidx_le));
 436 +       p += sizeof(bsscfgidx_le);
 437
 438         /* parameter buffer follows */
 439         if (datalen)
 440 @@ -347,12 +347,12 @@ brcmf_fil_bsscfg_data_set(struct brcmf_i
 441
 442         mutex_lock(&drvr->proto_block);
 443
 444 -       brcmf_dbg(FIL, "ifidx=%d, bssidx=%d, name=%s, len=%d\n", ifp->ifidx,
 445 -                 ifp->bssidx, name, len);
 446 +       brcmf_dbg(FIL, "ifidx=%d, bsscfgidx=%d, name=%s, len=%d\n", ifp->ifidx,
 447 +                 ifp->bsscfgidx, name, len);
 448         brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data,
 449                            min_t(uint, len, MAX_HEX_DUMP_LEN), "data\n");
 450
 451 -       buflen = brcmf_create_bsscfg(ifp->bssidx, name, data, len,
 452 +       buflen = brcmf_create_bsscfg(ifp->bsscfgidx, name, data, len,
 453                                      drvr->proto_buf, sizeof(drvr->proto_buf));
 454         if (buflen) {
 455                 err = brcmf_fil_cmd_data(ifp, BRCMF_C_SET_VAR, drvr->proto_buf,
 456 @@ -376,7 +376,7 @@ brcmf_fil_bsscfg_data_get(struct brcmf_i
 457
 458         mutex_lock(&drvr->proto_block);
 459
 460 -       buflen = brcmf_create_bsscfg(ifp->bssidx, name, data, len,
 461 +       buflen = brcmf_create_bsscfg(ifp->bsscfgidx, name, data, len,
 462                                      drvr->proto_buf, sizeof(drvr->proto_buf));
 463         if (buflen) {
 464                 err = brcmf_fil_cmd_data(ifp, BRCMF_C_GET_VAR, drvr->proto_buf,
 465 @@ -387,8 +387,8 @@ brcmf_fil_bsscfg_data_get(struct brcmf_i
 466                 err = -EPERM;
 467                 brcmf_err("Creating bsscfg failed\n");
 468         }
 469 -       brcmf_dbg(FIL, "ifidx=%d, bssidx=%d, name=%s, len=%d\n", ifp->ifidx,
 470 -                 ifp->bssidx, name, len);
 471 +       brcmf_dbg(FIL, "ifidx=%d, bsscfgidx=%d, name=%s, len=%d\n", ifp->ifidx,
 472 +                 ifp->bsscfgidx, name, len);
 473         brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data,
 474                            min_t(uint, len, MAX_HEX_DUMP_LEN), "data\n");
 475
 476 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
 477 +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
 478 @@ -170,7 +170,7 @@ struct brcmf_fil_af_params_le {
 479  };
 480
 481  struct brcmf_fil_bss_enable_le {
 482 -       __le32 bsscfg_idx;
 483 +       __le32 bsscfgidx;
 484         __le32 enable;
 485  };
 486
 487 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
 488 +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
 489 @@ -719,7 +719,7 @@ static void brcmf_fws_macdesc_init(struc
 490         desc->state = BRCMF_FWS_STATE_OPEN;
 491         desc->requested_credit = 0;
 492         desc->requested_packet = 0;
 493 -       /* depending on use may need ifp->bssidx instead */
 494 +       /* depending on use may need ifp->bsscfgidx instead */
 495         desc->interface_id = ifidx;
 496         desc->ac_bitmap = 0xff; /* update this when handling APSD */
 497         if (addr)
 498 @@ -1938,7 +1938,7 @@ void brcmf_fws_reset_interface(struct br
 499  {
 500         struct brcmf_fws_mac_descriptor *entry = ifp->fws_desc;
 501
 502 -       brcmf_dbg(TRACE, "enter: idx=%d\n", ifp->bssidx);
 503 +       brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);
 504         if (!entry)
 505                 return;
 506
 507 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
 508 +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
 509 @@ -2067,7 +2067,7 @@ static struct wireless_dev *brcmf_p2p_cr
 510         struct brcmf_if *p2p_ifp;
 511         struct brcmf_if *pri_ifp;
 512         int err;
 513 -       u32 bssidx;
 514 +       u32 bsscfgidx;
 515
 516         if (p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif)
 517                 return ERR_PTR(-ENOSPC);
 518 @@ -2113,13 +2113,13 @@ static struct wireless_dev *brcmf_p2p_cr
 519         memcpy(&p2p_vif->wdev.address, p2p->dev_addr, sizeof(p2p->dev_addr));
 520
 521         /* verify bsscfg index for P2P discovery */
 522 -       err = brcmf_fil_iovar_int_get(pri_ifp, "p2p_dev", &bssidx);
 523 +       err = brcmf_fil_iovar_int_get(pri_ifp, "p2p_dev", &bsscfgidx);
 524         if (err < 0) {
 525                 brcmf_err("retrieving discover bsscfg index failed\n");
 526                 goto fail;
 527         }
 528
 529 -       WARN_ON(p2p_ifp->bssidx != bssidx);
 530 +       WARN_ON(p2p_ifp->bsscfgidx != bsscfgidx);
 531
 532         init_completion(&p2p->send_af_done);
 533         INIT_WORK(&p2p->afx_hdl.afx_work, brcmf_p2p_afx_handler);