Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: e1000e: convert to use mc helpers

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jiri Pirko and committed by
David S. Miller
7aeef972 2cc04d27

+6 -11
+6 -11
drivers/net/e1000e/netdev.c
··· 2589 2589 2590 2590 ew32(RCTL, rctl); 2591 2591 2592 - if (netdev->mc_count) { 2593 - mta_list = kmalloc(netdev->mc_count * 6, GFP_ATOMIC); 2592 + if (!netdev_mc_empty(netdev)) { 2593 + mta_list = kmalloc(netdev_mc_count(netdev) * 6, GFP_ATOMIC); 2594 2594 if (!mta_list) 2595 2595 return; 2596 2596 2597 2597 /* prepare a packed array of only addresses. */ 2598 - mc_ptr = netdev->mc_list; 2599 - 2600 - for (i = 0; i < netdev->mc_count; i++) { 2601 - if (!mc_ptr) 2602 - break; 2603 - memcpy(mta_list + (i*ETH_ALEN), mc_ptr->dmi_addr, 2604 - ETH_ALEN); 2605 - mc_ptr = mc_ptr->next; 2606 - } 2598 + i = 0; 2599 + netdev_for_each_mc_addr(mc_ptr, netdev) 2600 + memcpy(mta_list + (i++ * ETH_ALEN), 2601 + mc_ptr->dmi_addr, ETH_ALEN); 2607 2602 2608 2603 e1000_update_mc_addr_list(hw, mta_list, i); 2609 2604 kfree(mta_list);