summaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.c
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2011-02-23 15:52:43 +0100
committerDavid S. Miller <davem@davemloft.net>2011-02-25 07:17:02 +0100
commitcdf64c803e6cfec72259f7bb2654261584bb80a8 (patch)
tree920e038e27bfdaefc1a48fd5b6d6efe894f1d2e7 /drivers/net/skge.c
parentMerge branch 'r8169-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff)
downloadlinux-cdf64c803e6cfec72259f7bb2654261584bb80a8.tar.xz
linux-cdf64c803e6cfec72259f7bb2654261584bb80a8.zip
skge: don't mark carrier down at start
The API for network devices has changed so that setting carrier off at probe is no longer required. This should fix the IPv6 addrconf issue. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=29612 Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Reported-by: George Billios <gbillios@gmail.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/skge.c')
-rw-r--r--drivers/net/skge.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 42daf98ba736..35b28f42d208 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3856,9 +3856,6 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port*8, ETH_ALEN);
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
- /* device is off until link detection */
- netif_carrier_off(dev);
-
return dev;
}