diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 09:32:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 09:32:56 +0200 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /drivers/net/ibm_newemac | |
| parent | ipv6: ip6_push_pending_frames() should increment IPSTATS_MIB_OUTDISCARDS (diff) | |
| parent | pkt_sched: Revert tasklet_hrtimer changes. (diff) | |
| download | linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.tar.xz linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
Diffstat (limited to 'drivers/net/ibm_newemac')
| -rw-r--r-- | drivers/net/ibm_newemac/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 5443558c439d..d7579e4feefc 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c @@ -1305,6 +1305,8 @@ static int emac_close(struct net_device *ndev) free_irq(dev->emac_irq, dev); + netif_carrier_off(ndev); + return 0; } |