Commit 8efc48a4 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://gkernel.bkbits.net/net-drivers-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 0661c4a9 5bd02272
...@@ -1134,27 +1134,6 @@ static int ei_open(struct net_device *dev) ...@@ -1134,27 +1134,6 @@ static int ei_open(struct net_device *dev)
return 0; 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 * ei_tx_timeout - handle transmit time out condition
* @dev: network device which has apparently fallen asleep * @dev: network device which has apparently fallen asleep
......
...@@ -362,7 +362,7 @@ static void fmvj18x_detach(dev_link_t *link) ...@@ -362,7 +362,7 @@ static void fmvj18x_detach(dev_link_t *link)
if (*linkp == NULL) if (*linkp == NULL)
return; return;
del_timer(&link->release); del_timer_sync(&link->release);
if (link->state & DEV_CONFIG) { if (link->state & DEV_CONFIG) {
fmvj18x_release((u_long)link); fmvj18x_release((u_long)link);
if (link->state & DEV_STALE_CONFIG) { if (link->state & DEV_STALE_CONFIG) {
...@@ -571,8 +571,7 @@ static void fmvj18x_config(dev_link_t *link) ...@@ -571,8 +571,7 @@ static void fmvj18x_config(dev_link_t *link)
case XXX10304: case XXX10304:
/* Read MACID from Buggy CIS */ /* Read MACID from Buggy CIS */
if (fmvj18x_get_hwinfo(link, tuple.TupleData) == -1) { if (fmvj18x_get_hwinfo(link, tuple.TupleData) == -1) {
printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net printk(KERN_NOTICE "fmvj18x_cs: unable to read hardware net address.\n");
address.");
unregister_netdev(dev); unregister_netdev(dev);
goto failed; 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