From: Jesse Brandeburg <jesse.brandeburg@gmail.com>
To: Jiri Pirko <jpirko@redhat.com>
Cc: netdev@vger.kernel.org, davem@davemloft.net
Subject: Re: [net-next-2.6 PATCH] e1000: convert to use netdev_for_each_mc_addr
Date: Mon, 22 Feb 2010 16:54:13 -0800 [thread overview]
Message-ID: <4807377b1002221654t423023efq9f6ad45492d1374f@mail.gmail.com> (raw)
In-Reply-To: <20100222191044.GC4141@psychotron.redhat.com>
On Mon, Feb 22, 2010 at 11:10 AM, Jiri Pirko <jpirko@redhat.com> wrote:
>
> Signed-off-by: Jiri Pirko <jpirko@redhat.com>
> ---
> drivers/net/e1000/e1000_main.c | 37 +++++++++++++++++--------------------
> 1 files changed, 17 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
> index 3b14dd7..c99f95c 100644
> --- a/drivers/net/e1000/e1000_main.c
> +++ b/drivers/net/e1000/e1000_main.c
> @@ -2161,29 +2161,26 @@ static void e1000_set_rx_mode(struct net_device *netdev)
>
> WARN_ON(i == rar_entries);
>
> - mc_ptr = netdev->mc_list;
> -
> - for (; i < rar_entries; i++) {
> - if (mc_ptr) {
> - e1000_rar_set(hw, mc_ptr->da_addr, i);
> - mc_ptr = mc_ptr->next;
> - } else {
> - E1000_WRITE_REG_ARRAY(hw, RA, i << 1, 0);
> - E1000_WRITE_FLUSH();
> - E1000_WRITE_REG_ARRAY(hw, RA, (i << 1) + 1, 0);
> - E1000_WRITE_FLUSH();
> + netdev_for_each_mc_addr(mc_ptr, netdev) {
> + if (i == rar_entries) {
> + /* load any remaining addresses into the hash table */
> + u32 hash_reg, hash_bit, mta;
> + hash_value = e1000_hash_mc_addr(hw, mc_ptr->da_addr);
> + hash_reg = (hash_value >> 5) & 0x7F;
> + hash_bit = hash_value & 0x1F;
> + mta = (1 << hash_bit);
> + mcarray[hash_reg] |= mta;
> + }
> + else {
nit - else should be in the same line like "} else {"
> + e1000_rar_set(hw, mc_ptr->da_addr, i++);
> }
> }
>
> - /* load any remaining addresses into the hash table */
> -
> - for (; mc_ptr; mc_ptr = mc_ptr->next) {
> - u32 hash_reg, hash_bit, mta;
> - hash_value = e1000_hash_mc_addr(hw, mc_ptr->da_addr);
> - hash_reg = (hash_value >> 5) & 0x7F;
> - hash_bit = hash_value & 0x1F;
> - mta = (1 << hash_bit);
> - mcarray[hash_reg] |= mta;
> + for (; i < rar_entries; i++) {
> + E1000_WRITE_REG_ARRAY(hw, RA, i << 1, 0);
> + E1000_WRITE_FLUSH();
> + E1000_WRITE_REG_ARRAY(hw, RA, (i << 1) + 1, 0);
> + E1000_WRITE_FLUSH();
> }
>
> /* write the hash table completely, write from bottom to avoid
otherwise seems okay. Thanks for your work on cleaning this stuff,
we'll be testing it as part of the net next testing already going on.
next prev parent reply other threads:[~2010-02-23 0:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-22 19:10 [net-next-2.6 PATCH] e1000: convert to use netdev_for_each_mc_addr Jiri Pirko
2010-02-22 23:47 ` David Miller
2010-02-23 0:54 ` Jesse Brandeburg [this message]
2010-02-23 7:32 ` Jiri Pirko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4807377b1002221654t423023efq9f6ad45492d1374f@mail.gmail.com \
--to=jesse.brandeburg@gmail.com \
--cc=davem@davemloft.net \
--cc=jpirko@redhat.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).