diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-03 09:44:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-03 09:44:28 -0800 |
| commit | e28599800a1274357492d85a653012ed3220b45c (patch) | |
| tree | e8563495264c20d363e421cdcd9aa3291b0d5bf8 /drivers/net/ethernet/netronome/nfp/nfp_net_common.c | |
| parent | 2ddbcea75a36dac2ff62ee33a0a8df37e994201e (diff) | |
| parent | fa42245dff4a5f2f8f208da542acbd80c22f7c65 (diff) | |
| download | linux-e28599800a1274357492d85a653012ed3220b45c.tar.gz linux-e28599800a1274357492d85a653012ed3220b45c.tar.xz | |
Merge branch 'bgmac-fixes'
Jon Mason says:
====================
net: ethernet: bgmac: bug fixes
Changes in v5:
* Rebased to the latest code and fixed up a compile error due to the
mac_addr struct going away (found by David Miller)
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
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfp_net_common.c')
0 files changed, 0 insertions, 0 deletions