From 6d193f5e3224c3620d7df396adc2670e7ff83532 Mon Sep 17 00:00:00 2001 From: "Jens Renner \\(EFE\\)" Date: Mon, 3 Jun 2013 04:32:52 +0000 Subject: [PATCH] --- yaml --- r: 376695 b: refs/heads/master c: 3a5395b3d57b9e3836c755434c88f4590d5ea6f6 h: refs/heads/master i: 376693: 24c55bdfc5467c9b49cb9a16c22b9a0bab305b40 376691: d65fe96c4b03f316dab2188f7bc10d9339cf61af 376687: b54deee51c2b3a453c3ebd3edef1812fae71fc06 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/xilinx/xilinx_emaclite.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b72ef1d0a7a9..fcc28c16c345 100644 --- 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 index 919b983114e9..b7268b3dae77 100644 --- 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);