From dd714ddfea1656fb5895434c2d515b6d75f67b7a Mon Sep 17 00:00:00 2001 From: Maciej Sosnowski Date: Wed, 1 Sep 2010 13:35:35 +0000 Subject: [PATCH] --- yaml --- r: 217755 b: refs/heads/master c: 52106bd24c8d5e8a26b98ad93a755b0827029860 h: refs/heads/master i: 217753: 1d0fc3c561f23d53d26d8d8641e5eee0c7c603e3 217751: 12f12f45e745c20ffde1efeb8973343148e7dbf8 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/nes/nes_nic.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 07a40b9f0fec..dc8437544400 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 293277215636e1586fcf6386b0b64457c6dfdb68 +refs/heads/master: 52106bd24c8d5e8a26b98ad93a755b0827029860 diff --git a/trunk/drivers/infiniband/hw/nes/nes_nic.c b/trunk/drivers/infiniband/hw/nes/nes_nic.c index 10560c796fd6..3892e2c0e95a 100644 --- a/trunk/drivers/infiniband/hw/nes/nes_nic.c +++ b/trunk/drivers/infiniband/hw/nes/nes_nic.c @@ -271,6 +271,7 @@ static int nes_netdev_stop(struct net_device *netdev) if (netif_msg_ifdown(nesvnic)) printk(KERN_INFO PFX "%s: disabling interface\n", netdev->name); + netif_carrier_off(netdev); /* Disable network packets */ napi_disable(&nesvnic->napi);