Skip to content

Commit

Permalink
net: e1000e: convert to use mc helpers
Browse files Browse the repository at this point in the history
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Feb 5, 2010
1 parent 2cc04d2 commit 7aeef97
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions drivers/net/e1000e/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 7aeef97

Please sign in to comment.