---

yaml --- r: 376695 b: refs/heads/master c: 3a5395b h: refs/heads/master i: 376693: 24c55bd 376691: d65fe96 376687: b54deee v: v3
git-mirror · Jun 5, 2013 · 6d193f5 · 6d193f5
1 parent 8d029f0
commit 6d193f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44dbc78ee43d5df0bbcd7f3ae6a0ba00ed261e95
+refs/heads/master: 3a5395b3d57b9e3836c755434c88f4590d5ea6f6
diff --git a/trunk/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/trunk/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -946,7 +946,8 @@ static int xemaclite_open(struct net_device *dev)
 		phy_write(lp->phy_dev, MII_CTRL1000, 0);
 
 		/* Advertise only 10 and 100mbps full/half duplex speeds */
-		phy_write(lp->phy_dev, MII_ADVERTISE, ADVERTISE_ALL);
+		phy_write(lp->phy_dev, MII_ADVERTISE, ADVERTISE_ALL |
+			  ADVERTISE_CSMA);
 
 		/* Restart auto negotiation */
 		bmcr = phy_read(lp->phy_dev, MII_BMCR);