Merge branch 'hns-fixes'

Browse source

yankejian says:

====================
net: hns: fixes two bugs in hns driver

  This patchset fixes two bugs in hns driver.
  - fixes timeout when received pause frame from the connective ports
  - should be set by using ethtool -s when the devices are link down
====================

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

...

This commit is contained in:

David S. Miller 2015-10-18 19:57:12 -07:00

parent 4639a3b522 90a505b9f6

commit a679dbbbc6

2 changed files with 18 additions and 34 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

13

drivers/net/ethernet/hisilicon/hns/hns_enet.c

View file

39

drivers/net/ethernet/hisilicon/hns/hns_ethtool.c

View file