Merge branch 'bcmgenet-net'

Browse source

Florian Fainelli says:

====================
net: bcmgenet: power management related fixes

These two patches fixes issues seen while testing power management on
platforms using the GENET driver.

First patch fixes an issue with the PHY state machine queuing work after
resume since we are not properly detached from it.

Second patch fixes an issue with GENET interfaces that were not properly
restored to a working state after a S3 suspend/resume cycle.
====================

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

...

This commit is contained in:

David S. Miller 2014-11-11 18:23:29 -05:00

parent 93ecd2607f dbd479db79

commit caa13a9f6a

3 changed files with 17 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

drivers/net/ethernet/broadcom/genet/bcmgenet.c

View file

3

drivers/net/ethernet/broadcom/genet/bcmgenet.h

View file

9

drivers/net/ethernet/broadcom/genet/bcmmii.c

View file