projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
intel
/
ixgbe
/
ixgbe_phy.c
diff --git
a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index
dc97c03
..
acafe39
100644
(file)
--- a/
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@
-706,7
+706,6
@@
s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw)
hw->phy.ops.write_reg(hw, MDIO_CTRL1,
MDIO_MMD_AN, autoneg_reg);
-
return 0;
}