git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b43: N-PHY: use b43_phy_n_sfo_cfg rather than duplicating same fields
[safe/jmp/linux-2.6]
/
drivers
/
net
/
s2io.c
diff --git
a/drivers/net/s2io.c
b/drivers/net/s2io.c
index
ac61890
..
43bc66a
100644
(file)
--- a/
drivers/net/s2io.c
+++ b/
drivers/net/s2io.c
@@
-3421,7
+3421,7
@@
static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit,
break;
}
} else {
break;
}
} else {
- if (
!(val64 & busy_bit)
) {
+ if (
val64 & busy_bit
) {
ret = SUCCESS;
break;
}
ret = SUCCESS;
break;
}
@@
-5055,8
+5055,8
@@
static void s2io_set_multicast(struct net_device *dev)
}
/* Update individual M_CAST address list */
}
/* Update individual M_CAST address list */
- if ((!sp->m_cast_flg) &&
dev->mc_count
) {
- if (
dev->mc_count
>
+ if ((!sp->m_cast_flg) &&
netdev_mc_count(dev)
) {
+ if (
netdev_mc_count(dev)
>
(config->max_mc_addr - config->max_mac_addr)) {
DBG_PRINT(ERR_DBG,
"%s: No more Rx filters can be added - "
(config->max_mc_addr - config->max_mac_addr)) {
DBG_PRINT(ERR_DBG,
"%s: No more Rx filters can be added - "
@@
-5066,7
+5066,7
@@
static void s2io_set_multicast(struct net_device *dev)
}
prev_cnt = sp->mc_addr_count;
}
prev_cnt = sp->mc_addr_count;
- sp->mc_addr_count =
dev->mc_count
;
+ sp->mc_addr_count =
netdev_mc_count(dev)
;
/* Clear out the previous list of Mc in the H/W. */
for (i = 0; i < prev_cnt; i++) {
/* Clear out the previous list of Mc in the H/W. */
for (i = 0; i < prev_cnt; i++) {
@@
-5092,8
+5092,8
@@
static void s2io_set_multicast(struct net_device *dev)
}
/* Create the new Rx filter list and update the same in H/W. */
}
/* Create the new Rx filter list and update the same in H/W. */
-
for (i = 0, mclist = dev->mc_list; i < dev->mc_count
;
-
i++, mclist = mclist->next
) {
+
i = 0
;
+
netdev_for_each_mc_addr(mclist, dev
) {
memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr,
ETH_ALEN);
mac_addr = 0;
memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr,
ETH_ALEN);
mac_addr = 0;
@@
-5121,6
+5121,7
@@
static void s2io_set_multicast(struct net_device *dev)
dev->name);
return;
}
dev->name);
return;
}
+ i++;
}
}
}
}
}
}