From: Jon Mason <jon.mason@broadcom.com>
To: David Miller <davem@davemloft.net>
Cc: rafal@milecki.pl, bcm-kernel-feedback-list@broadcom.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net v4 0/2] net: ethernet: bgmac: bug fixes
Date: Thu, 2 Mar 2017 17:57:05 -0500 [thread overview]
Message-ID: <20170302225704.GA5178@broadcom.com> (raw)
In-Reply-To: <20170302.125605.1084925031741881031.davem@davemloft.net>
On Thu, Mar 02, 2017 at 12:56:05PM -0800, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Thu, 02 Mar 2017 12:50:15 -0800 (PST)
>
> > From: Jon Mason <jon.mason@broadcom.com>
> > Date: Tue, 28 Feb 2017 13:41:49 -0500
> >
> >> Changes in v4:
> >> * Added the udelays from the previous code (per David Miller)
> >>
> >> Changes in v3:
> >> * Reworked the init sequence patch to only remove the device reset if
> >> the device is actually in reset. Given that this code doesn't bear
> >> much resemblance to the original code, I'm changing the author of the
> >> patch. This was tested on NS2 SVK.
> >>
> >> Changes in v2:
> >> * Reworked the first match to make it more obvious what portions of the
> >> register were being preserved (Per Rafal Mileki)
> >> * Style change to reorder the function variables in patch 2 (per Sergei
> >> Shtylyov)
> >>
> >> Bug fixes for bgmac driver
> >
> > Series applied.
>
> Actually, this doesn't even compile. Reverted...
>
> [davem@kkuri net]$ make -s -j4
> drivers/net/ethernet/broadcom/bgmac.c: In function ‘bgmac_set_mac_address’:
> drivers/net/ethernet/broadcom/bgmac.c:1233:23: error: ‘struct bgmac’ has no member named ‘mac_addr’; did you mean ‘phyaddr’?
> ether_addr_copy(bgmac->mac_addr, sa->sa_data);
> ^~
> drivers/net/ethernet/broadcom/bgmac.c:1234:38: error: ‘struct bgmac’ has no member named ‘mac_addr’; did you mean ‘phyaddr’?
> bgmac_write_mac_address(bgmac, bgmac->mac_addr);
> ^~
Well this is embarrassing. I didn't rebase, even though I acked the
patch which changed it out from under me. Sorry, I should've known
better.
Rebased, compiled, and tested patch coming shortly. I appreciate your
patience.
Thanks,
Jon
prev parent reply other threads:[~2017-03-03 0:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-28 18:41 [PATCH net v4 0/2] net: ethernet: bgmac: bug fixes Jon Mason
2017-02-28 18:41 ` [PATCH net v4 1/2] net: ethernet: bgmac: init sequence bug Jon Mason
2017-02-28 18:41 ` [PATCH net v4 2/2] net: ethernet: bgmac: mac address change bug Jon Mason
2017-03-02 20:50 ` [PATCH net v4 0/2] net: ethernet: bgmac: bug fixes David Miller
2017-03-02 20:56 ` David Miller
2017-03-02 22:57 ` Jon Mason [this message]
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=20170302225704.GA5178@broadcom.com \
--to=jon.mason@broadcom.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=rafal@milecki.pl \
/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).