From: Jon Mason <[email protected]>
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.
From: David Miller <[email protected]>
Date: Thu, 02 Mar 2017 12:50:15 -0800 (PST)
> From: Jon Mason <[email protected]>
> 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);
^~
On Thu, Mar 02, 2017 at 12:56:05PM -0800, David Miller wrote:
> From: David Miller <[email protected]>
> Date: Thu, 02 Mar 2017 12:50:15 -0800 (PST)
>
> > From: Jon Mason <[email protected]>
> > 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