diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2010-02-05 02:52:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-05 08:58:40 -0800 |
| commit | 7aeef972cce30b0ab04047e07918b04d867e7a29 (patch) | |
| tree | 504bf9d83a372d4bf79c7421bf2ff53ae7636cde | |
| parent | 2cc04d27c497af9e8d11181fa8ddef9c99592c78 (diff) | |
| download | op-kernel-dev-7aeef972cce30b0ab04047e07918b04d867e7a29.zip op-kernel-dev-7aeef972cce30b0ab04047e07918b04d867e7a29.tar.gz | |
net: e1000e: convert to use mc helpers
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index ffa37c6..88d54d3 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -2589,21 +2589,16 @@ static void e1000_set_multi(struct net_device *netdev) ew32(RCTL, rctl); - if (netdev->mc_count) { - mta_list = kmalloc(netdev->mc_count * 6, GFP_ATOMIC); + if (!netdev_mc_empty(netdev)) { + mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC); if (!mta_list) return; /* prepare a packed array of only addresses. */ - mc_ptr = netdev->mc_list; - - for (i = 0; i < netdev->mc_count; i++) { - if (!mc_ptr) - break; - memcpy(mta_list + (i*ETH_ALEN), mc_ptr->dmi_addr, - ETH_ALEN); - mc_ptr = mc_ptr->next; - } + i = 0; + netdev_for_each_mc_addr(mc_ptr, netdev) + memcpy(mta_list + (i++ * ETH_ALEN), + mc_ptr->dmi_addr, ETH_ALEN); e1000_update_mc_addr_list(hw, mta_list, i); kfree(mta_list); |
