Merge branch 'gianfar-wol-fixes'
authorDavid S. Miller <davem@davemloft.net>
Fri, 31 Jul 2015 22:41:50 +0000 (15:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Jul 2015 22:41:50 +0000 (15:41 -0700)
commitef1f4364f62f0b9cee25a56e7af3915b41eea0a4
tree29c4b47469d63ffbea013c01167a7602ecc78bb7
parent5175f7106cc55a1bcf97bf7d5ba0900017ebcef8
parentb0734b6dc895258b74c6e7a441cb47b6b0ba3465
Merge branch 'gianfar-wol-fixes'

Claudiu Manoil says:

====================
gianfar: wol magic packet fixes

These changes were already validated as part of FSL SDK.
Patch 2 fixes occasional wake-on magic packet failures during
traffic, probably due to incorrect traffic stop/ device halt
sequence and incorrect usage of txlock.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>