android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

brcm80211: rename variable in _brcmf_set_multicast_list()

Browse Source 
The variable allmulti was used to provision IFF_ALLMULTI to the
device as well as IFF_PROMISC. For clarity the variable has been
renamed.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Arend van Spriel
2011-10-12 20:51:17 +02:00
committed by John W. Linville
parent f7264adb9a
commit b5036243c1
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
View File

@ -136,9 +136,9 @@ static void _brcmf_set_multicast_list(struct work_struct *work)
{ {
struct net_device *ndev; struct net_device *ndev;
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
u32 allmulti, cnt; u32 dcmd_value, cnt;
__le32 cnt_le; __le32 cnt_le;
__le32 allmulti_le; __le32 dcmd_le_value;
struct brcmf_dcmd dcmd; struct brcmf_dcmd dcmd;
char *buf, *bufp; char *buf, *bufp;
@ -152,7 +152,7 @@ static void _brcmf_set_multicast_list(struct work_struct *work)
cnt = netdev_mc_count(ndev); cnt = netdev_mc_count(ndev);
/* Determine initial value of allmulti flag */ /* Determine initial value of allmulti flag */
allmulti = (ndev->flags & IFF_ALLMULTI) ? true : false; dcmd_value = (ndev->flags & IFF_ALLMULTI) ? true : false;
/* Send down the multicast list first. */ /* Send down the multicast list first. */
@ -186,7 +186,7 @@ static void _brcmf_set_multicast_list(struct work_struct *work)
if (ret < 0) { if (ret < 0) {
brcmf_dbg(ERROR, "%s: set mcast_list failed, cnt %d\n", brcmf_dbg(ERROR, "%s: set mcast_list failed, cnt %d\n",
brcmf_ifname(&drvr_priv->pub, 0), cnt); brcmf_ifname(&drvr_priv->pub, 0), cnt);
allmulti = cnt ? true : allmulti; dcmd_value = cnt ? true : dcmd_value;
} }
kfree(buf); kfree(buf);
@ -196,19 +196,19 @@ static void _brcmf_set_multicast_list(struct work_struct *work)
* were trying to set some addresses and dongle rejected it... * were trying to set some addresses and dongle rejected it...
*/ */
buflen = sizeof("allmulti") + sizeof(allmulti); buflen = sizeof("allmulti") + sizeof(dcmd_value);
buf = kmalloc(buflen, GFP_ATOMIC); buf = kmalloc(buflen, GFP_ATOMIC);
if (!buf) if (!buf)
return; return;
allmulti_le = cpu_to_le32(allmulti); dcmd_le_value = cpu_to_le32(dcmd_value);
if (!brcmu_mkiovar if (!brcmu_mkiovar
("allmulti", (void *)&allmulti_le, ("allmulti", (void *)&dcmd_le_value,
sizeof(allmulti_le), buf, buflen)) { sizeof(dcmd_le_value), buf, buflen)) {
brcmf_dbg(ERROR, "%s: mkiovar failed for allmulti, datalen %d buflen %u\n", brcmf_dbg(ERROR, "%s: mkiovar failed for allmulti, datalen %d buflen %u\n",
brcmf_ifname(&drvr_priv->pub, 0), brcmf_ifname(&drvr_priv->pub, 0),
(int)sizeof(allmulti), buflen); (int)sizeof(dcmd_value), buflen);
kfree(buf); kfree(buf);
return; return;
} }
@ -223,7 +223,7 @@ static void _brcmf_set_multicast_list(struct work_struct *work)
if (ret < 0) { if (ret < 0) {
brcmf_dbg(ERROR, "%s: set allmulti %d failed\n", brcmf_dbg(ERROR, "%s: set allmulti %d failed\n",
brcmf_ifname(&drvr_priv->pub, 0), brcmf_ifname(&drvr_priv->pub, 0),
le32_to_cpu(allmulti_le)); le32_to_cpu(dcmd_le_value));
} }
kfree(buf); kfree(buf);
@ -231,20 +231,20 @@ static void _brcmf_set_multicast_list(struct work_struct *work)
/* Finally, pick up the PROMISC flag as well, like the NIC /* Finally, pick up the PROMISC flag as well, like the NIC
driver does */ driver does */
allmulti = (ndev->flags & IFF_PROMISC) ? true : false; dcmd_value = (ndev->flags & IFF_PROMISC) ? true : false;
allmulti_le = cpu_to_le32(allmulti); dcmd_le_value = cpu_to_le32(dcmd_value);
memset(&dcmd, 0, sizeof(dcmd)); memset(&dcmd, 0, sizeof(dcmd));
dcmd.cmd = BRCMF_C_SET_PROMISC; dcmd.cmd = BRCMF_C_SET_PROMISC;
dcmd.buf = &allmulti_le; dcmd.buf = &dcmd_le_value;
dcmd.len = sizeof(allmulti_le); dcmd.len = sizeof(dcmd_le_value);
dcmd.set = true; dcmd.set = true;
ret = brcmf_proto_dcmd(&drvr_priv->pub, 0, &dcmd, dcmd.len); ret = brcmf_proto_dcmd(&drvr_priv->pub, 0, &dcmd, dcmd.len);
if (ret < 0) { if (ret < 0) {
brcmf_dbg(ERROR, "%s: set promisc %d failed\n", brcmf_dbg(ERROR, "%s: set promisc %d failed\n",
brcmf_ifname(&drvr_priv->pub, 0), brcmf_ifname(&drvr_priv->pub, 0),
le32_to_cpu(allmulti_le)); le32_to_cpu(dcmd_le_value));
} }
} }