git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pandora: update defconfig
[pandora-kernel.git]
/
drivers
/
net
/
ibmlana.c
diff --git
a/drivers/net/ibmlana.c
b/drivers/net/ibmlana.c
index
7d6cf33
..
294ccfb
100644
(file)
--- a/
drivers/net/ibmlana.c
+++ b/
drivers/net/ibmlana.c
@@
-384,7
+384,7
@@
static void InitBoard(struct net_device *dev)
int camcnt;
camentry_t cams[16];
u32 cammask;
int camcnt;
camentry_t cams[16];
u32 cammask;
- struct
dev_mc_list *mcptr
;
+ struct
netdev_hw_addr *ha
;
u16 rcrval;
/* reset the SONIC */
u16 rcrval;
/* reset the SONIC */
@@
-419,8
+419,8
@@
static void InitBoard(struct net_device *dev)
/* start putting the multicast addresses into the CAM list. Stop if
it is full. */
/* start putting the multicast addresses into the CAM list. Stop if
it is full. */
- netdev_for_each_mc_addr(
mcptr
, dev) {
- putcam(cams, &camcnt,
mcptr->dmi_
addr);
+ netdev_for_each_mc_addr(
ha
, dev) {
+ putcam(cams, &camcnt,
ha->
addr);
if (camcnt == 16)
break;
}
if (camcnt == 16)
break;
}
@@
-478,7
+478,7
@@
static void InitBoard(struct net_device *dev)
/* if still multicast addresses left or ALLMULTI is set, set the multicast
enable bit */
/* if still multicast addresses left or ALLMULTI is set, set the multicast
enable bit */
- if ((dev->flags & IFF_ALLMULTI) ||
(mcptr != NULL)
)
+ if ((dev->flags & IFF_ALLMULTI) ||
netdev_mc_count(dev) > camcnt
)
rcrval |= RCREG_AMC;
/* promiscous mode ? */
rcrval |= RCREG_AMC;
/* promiscous mode ? */