projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge staging-next tree into Linus's latest version
[linux-drm-fsl-dcu.git]
/
drivers
/
staging
/
wlags49_h2
/
wl_netdev.c
diff --git
a/drivers/staging/wlags49_h2/wl_netdev.c
b/drivers/staging/wlags49_h2/wl_netdev.c
index 91fd3092b47d4c27536a2f676c68595dc435e2a7..1aa61dbdb79ffdf269332f4963789be6512f1947 100644
(file)
--- a/
drivers/staging/wlags49_h2/wl_netdev.c
+++ b/
drivers/staging/wlags49_h2/wl_netdev.c
@@
-1047,7
+1047,7
@@
void wl_multicast( struct net_device *dev )
//;?seems reasonable that even an AP-only driver could afford this small additional footprint
int x;
//;?seems reasonable that even an AP-only driver could afford this small additional footprint
int x;
- struct
dev_mc_list *mclist
;
+ struct
netdev_hw_addr *ha
;
struct wl_private *lp = wl_priv(dev);
unsigned long flags;
/*------------------------------------------------------------------------*/
struct wl_private *lp = wl_priv(dev);
unsigned long flags;
/*------------------------------------------------------------------------*/
@@
-1070,9
+1070,9
@@
void wl_multicast( struct net_device *dev )
DBG_PRINT( " mc_count: %d\n", netdev_mc_count(dev));
DBG_PRINT( " mc_count: %d\n", netdev_mc_count(dev));
- netdev_for_each_mc_addr(
mclist
, dev)
- DBG_PRINT(
" %s (%d)\n", DbgHwAddr(mclist->dmi_
addr),
-
mclist->dmi_addrlen
);
+ netdev_for_each_mc_addr(
ha
, dev)
+ DBG_PRINT(
" %s (%d)\n", DbgHwAddr(ha->
addr),
+
dev->addr_len
);
}
#endif /* DBG */
}
#endif /* DBG */
@@
-1117,9
+1117,9
@@
void wl_multicast( struct net_device *dev )
lp->ltvRecord.typ = CFG_GROUP_ADDR;
x = 0;
lp->ltvRecord.typ = CFG_GROUP_ADDR;
x = 0;
- netdev_for_each_mc_addr(
mclist
, dev)
+ netdev_for_each_mc_addr(
ha
, dev)
memcpy(&(lp->ltvRecord.u.u8[x++ * ETH_ALEN]),
memcpy(&(lp->ltvRecord.u.u8[x++ * ETH_ALEN]),
-
mclist->dmi_
addr, ETH_ALEN);
+
ha->
addr, ETH_ALEN);
DBG_PRINT( "Setting multicast list\n" );
hcf_put_info( &( lp->hcfCtx ), (LTVP)&( lp->ltvRecord ));
} else {
DBG_PRINT( "Setting multicast list\n" );
hcf_put_info( &( lp->hcfCtx ), (LTVP)&( lp->ltvRecord ));
} else {