Commit 74502844 authored by Jeff Garzik's avatar Jeff Garzik

Merge redhat.com:/home/jgarzik/repo/linus-2.5

into redhat.com:/home/jgarzik/repo/net-drivers-2.5
parents 43756209 a6f6b4a0
......@@ -1134,27 +1134,6 @@ static int ei_open(struct net_device *dev)
return 0;
}
/**
* ei_close - shut down network device
* @dev: network device to close
*
* Opposite of ei_open(). Only used when "ifconfig <devname> down" is done.
*/
static int ei_close(struct net_device *dev)
{
unsigned long flags;
/*
* Hold the page lock during close
*/
spin_lock_irqsave(&((struct ei_device *)dev->priv)->page_lock, flags);
NS8390_init(dev, 0);
spin_unlock_irqrestore(&((struct ei_device *)dev->priv)->page_lock, flags);
netif_stop_queue(dev);
return 0;
}
/**
* ei_tx_timeout - handle transmit time out condition
* @dev: network device which has apparently fallen asleep
......
......@@ -362,7 +362,7 @@ static void fmvj18x_detach(dev_link_t *link)
if (*linkp == NULL)
return;
del_timer(&link->release);
del_timer_sync(&link->release);
if (link->state & DEV_CONFIG) {
fmvj18x_release((u_long)link);
if (link->state & DEV_STALE_CONFIG) {
......@@ -571,8 +571,7 @@ static void fmvj18x_config(dev_link_t *link)
case XXX10304:
/* Read MACID from Buggy CIS */
if (fmvj18x_get_hwinfo(link, tuple.TupleData) == -1) {
printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net
address.");
printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net address.\n");
unregister_netdev(dev);
goto failed;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment