Commit b430f188 authored by Jeff Garzik's avatar Jeff Garzik

Merge pobox.com:/garz/repo/netdev-2.6/set-config

into pobox.com:/garz/repo/net-drivers-2.6
parents 511979cc e2bfa60b
...@@ -917,14 +917,6 @@ static void dvb_net_set_multicast_list (struct net_device *dev) ...@@ -917,14 +917,6 @@ static void dvb_net_set_multicast_list (struct net_device *dev)
} }
static int dvb_net_set_config(struct net_device *dev, struct ifmap *map)
{
if (netif_running(dev))
return -EBUSY;
return 0;
}
static void wq_restart_net_feed (void *data) static void wq_restart_net_feed (void *data)
{ {
struct net_device *dev = data; struct net_device *dev = data;
...@@ -983,7 +975,6 @@ static void dvb_net_setup(struct net_device *dev) ...@@ -983,7 +975,6 @@ static void dvb_net_setup(struct net_device *dev)
dev->hard_start_xmit = dvb_net_tx; dev->hard_start_xmit = dvb_net_tx;
dev->get_stats = dvb_net_get_stats; dev->get_stats = dvb_net_get_stats;
dev->set_multicast_list = dvb_net_set_multicast_list; dev->set_multicast_list = dvb_net_set_multicast_list;
dev->set_config = dvb_net_set_config;
dev->set_mac_address = dvb_net_set_mac; dev->set_mac_address = dvb_net_set_mac;
dev->mtu = 4096; dev->mtu = 4096;
dev->mc_count = 0; dev->mc_count = 0;
......
...@@ -885,14 +885,6 @@ static struct net_device_stats *ibmlana_stats(struct net_device *dev) ...@@ -885,14 +885,6 @@ static struct net_device_stats *ibmlana_stats(struct net_device *dev)
return &priv->stat; return &priv->stat;
} }
/* we don't support runtime reconfiguration, since am MCA card can
be unambigously identified by its POS registers. */
static int ibmlana_config(struct net_device *dev, struct ifmap *map)
{
return 0;
}
/* switch receiver mode. */ /* switch receiver mode. */
static void ibmlana_set_multicast_list(struct net_device *dev) static void ibmlana_set_multicast_list(struct net_device *dev)
...@@ -984,7 +976,6 @@ static int ibmlana_probe(struct net_device *dev) ...@@ -984,7 +976,6 @@ static int ibmlana_probe(struct net_device *dev)
dev->open = ibmlana_open; dev->open = ibmlana_open;
dev->stop = ibmlana_close; dev->stop = ibmlana_close;
dev->set_config = ibmlana_config;
dev->hard_start_xmit = ibmlana_tx; dev->hard_start_xmit = ibmlana_tx;
dev->do_ioctl = NULL; dev->do_ioctl = NULL;
dev->get_stats = ibmlana_stats; dev->get_stats = ibmlana_stats;
......
...@@ -367,31 +367,6 @@ static int meth_release(struct net_device *dev) ...@@ -367,31 +367,6 @@ static int meth_release(struct net_device *dev)
return 0; return 0;
} }
/*
* Configuration changes (passed on by ifconfig)
*/
static int meth_config(struct net_device *dev, struct ifmap *map)
{
if (dev->flags & IFF_UP) /* can't act on a running interface */
return -EBUSY;
/* Don't allow changing the I/O address */
if (map->base_addr != dev->base_addr) {
printk(KERN_WARNING "meth: Can't change I/O address\n");
return -EOPNOTSUPP;
}
/* Don't allow changing the IRQ */
if (map->irq != dev->irq) {
printk(KERN_WARNING "meth: Can't change IRQ\n");
return -EOPNOTSUPP;
}
DPRINTK("Configured\n");
/* ignore other fields */
return 0;
}
/* /*
* Receive a packet: retrieve, encapsulate and pass over to upper levels * Receive a packet: retrieve, encapsulate and pass over to upper levels
*/ */
...@@ -813,7 +788,6 @@ static struct net_device *meth_init(void) ...@@ -813,7 +788,6 @@ static struct net_device *meth_init(void)
dev->open = meth_open; dev->open = meth_open;
dev->stop = meth_release; dev->stop = meth_release;
dev->set_config = meth_config;
dev->hard_start_xmit = meth_tx; dev->hard_start_xmit = meth_tx;
dev->do_ioctl = meth_ioctl; dev->do_ioctl = meth_ioctl;
dev->get_stats = meth_stats; dev->get_stats = meth_stats;
......
...@@ -972,14 +972,6 @@ static struct net_device_stats *skmca_stats(struct net_device *dev) ...@@ -972,14 +972,6 @@ static struct net_device_stats *skmca_stats(struct net_device *dev)
return &(priv->stat); return &(priv->stat);
} }
/* we don't support runtime reconfiguration, since an MCA card can
be unambigously identified by its POS registers. */
static int skmca_config(struct net_device *dev, struct ifmap *map)
{
return 0;
}
/* switch receiver mode. We use the LANCE's multicast filter to prefilter /* switch receiver mode. We use the LANCE's multicast filter to prefilter
multicast addresses. */ multicast addresses. */
...@@ -1147,7 +1139,6 @@ struct net_device * __init skmca_probe(int unit) ...@@ -1147,7 +1139,6 @@ struct net_device * __init skmca_probe(int unit)
/* set methods */ /* set methods */
dev->open = skmca_open; dev->open = skmca_open;
dev->stop = skmca_close; dev->stop = skmca_close;
dev->set_config = skmca_config;
dev->hard_start_xmit = skmca_tx; dev->hard_start_xmit = skmca_tx;
dev->do_ioctl = NULL; dev->do_ioctl = NULL;
dev->get_stats = skmca_stats; dev->get_stats = skmca_stats;
......
...@@ -101,7 +101,6 @@ static int lmc_open(struct net_device *dev); ...@@ -101,7 +101,6 @@ static int lmc_open(struct net_device *dev);
static int lmc_close(struct net_device *dev); static int lmc_close(struct net_device *dev);
static struct net_device_stats *lmc_get_stats(struct net_device *dev); static struct net_device_stats *lmc_get_stats(struct net_device *dev);
static irqreturn_t lmc_interrupt(int irq, void *dev_instance, struct pt_regs *regs); static irqreturn_t lmc_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
static int lmc_set_config(struct net_device *dev, struct ifmap *map);
static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, size_t csr_size); static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, size_t csr_size);
static void lmc_softreset(lmc_softc_t * const); static void lmc_softreset(lmc_softc_t * const);
static void lmc_running_reset(struct net_device *dev); static void lmc_running_reset(struct net_device *dev);
...@@ -814,7 +813,6 @@ static void lmc_setup(struct net_device * const dev) /*fold00*/ ...@@ -814,7 +813,6 @@ static void lmc_setup(struct net_device * const dev) /*fold00*/
dev->stop = lmc_close; dev->stop = lmc_close;
dev->get_stats = lmc_get_stats; dev->get_stats = lmc_get_stats;
dev->do_ioctl = lmc_ioctl; dev->do_ioctl = lmc_ioctl;
dev->set_config = lmc_set_config;
dev->tx_timeout = lmc_driver_timeout; dev->tx_timeout = lmc_driver_timeout;
dev->watchdog_timeo = (HZ); /* 1 second */ dev->watchdog_timeo = (HZ); /* 1 second */
...@@ -1975,13 +1973,6 @@ static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/ ...@@ -1975,13 +1973,6 @@ static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/
lmc_trace(sc->lmc_device, "lmc_softreset out"); lmc_trace(sc->lmc_device, "lmc_softreset out");
} }
static int lmc_set_config(struct net_device *dev, struct ifmap *map) /*fold00*/
{
lmc_trace(dev, "lmc_set_config in");
lmc_trace(dev, "lmc_set_config out");
return -EOPNOTSUPP;
}
void lmc_gpio_mkinput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/ void lmc_gpio_mkinput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/
{ {
lmc_trace(sc->lmc_device, "lmc_gpio_mkinput in"); lmc_trace(sc->lmc_device, "lmc_gpio_mkinput in");
......
...@@ -219,7 +219,6 @@ static void netwave_reset(struct net_device *dev); ...@@ -219,7 +219,6 @@ static void netwave_reset(struct net_device *dev);
/* Misc device stuff */ /* Misc device stuff */
static int netwave_open(struct net_device *dev); /* Open the device */ static int netwave_open(struct net_device *dev); /* Open the device */
static int netwave_close(struct net_device *dev); /* Close the device */ static int netwave_close(struct net_device *dev); /* Close the device */
static int netwave_config(struct net_device *dev, struct ifmap *map);
/* Packet transmission and Packet reception */ /* Packet transmission and Packet reception */
static int netwave_start_xmit( struct sk_buff *skb, struct net_device *dev); static int netwave_start_xmit( struct sk_buff *skb, struct net_device *dev);
...@@ -482,7 +481,6 @@ static dev_link_t *netwave_attach(void) ...@@ -482,7 +481,6 @@ static dev_link_t *netwave_attach(void)
/* Netwave specific entries in the device structure */ /* Netwave specific entries in the device structure */
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
dev->hard_start_xmit = &netwave_start_xmit; dev->hard_start_xmit = &netwave_start_xmit;
dev->set_config = &netwave_config;
dev->get_stats = &netwave_get_stats; dev->get_stats = &netwave_get_stats;
dev->set_multicast_list = &set_multicast_list; dev->set_multicast_list = &set_multicast_list;
/* wireless extensions */ /* wireless extensions */
...@@ -1288,16 +1286,6 @@ static void netwave_reset(struct net_device *dev) { ...@@ -1288,16 +1286,6 @@ static void netwave_reset(struct net_device *dev) {
outb(corConfIENA + corConfLVLREQ, iobase + NETWAVE_REG_COR); outb(corConfIENA + corConfLVLREQ, iobase + NETWAVE_REG_COR);
} }
/*
* Function netwave_config (dev, map)
*
* Configure device, this work is done by netwave_pcmcia_config when a
* card is inserted
*/
static int netwave_config(struct net_device *dev, struct ifmap *map) {
return 0;
}
/* /*
* Function netwave_hw_xmit (data, len, dev) * Function netwave_hw_xmit (data, len, dev)
*/ */
......
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