From 8190e5b5eefd914944110c3dac390d636c85ee24 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Fri, 5 Feb 2010 02:52:39 +0000 Subject: [PATCH] --- yaml --- r: 183977 b: refs/heads/master c: 7aeef972cce30b0ab04047e07918b04d867e7a29 h: refs/heads/master i: 183975: 3cc70d593f3ce224054f59112309c85a1a098dea v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 94ace625115c..d7e34599af51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cc04d27c497af9e8d11181fa8ddef9c99592c78 +refs/heads/master: 7aeef972cce30b0ab04047e07918b04d867e7a29 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index ffa37c682a00..88d54d3efcef 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/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);