git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
wan
/
lmc
/
lmc_main.c
diff --git
a/drivers/net/wan/lmc/lmc_main.c
b/drivers/net/wan/lmc/lmc_main.c
index
332202b
..
2b54f1b
100644
(file)
--- a/
drivers/net/wan/lmc/lmc_main.c
+++ b/
drivers/net/wan/lmc/lmc_main.c
@@
-56,11
+56,11
@@
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/inet.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/inet.h>
+#include <linux/bitops.h>
#include <net/syncppp.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <net/syncppp.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
-#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
@@
-100,8
+100,7
@@
static int lmc_rx (struct net_device *dev);
static int lmc_open(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 int lmc_open(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 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 irqreturn_t lmc_interrupt(int irq, void *dev_instance);
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_running_reset(struct net_device *dev);
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_running_reset(struct net_device *dev);
@@
-642,7
+641,7
@@
static void lmc_watchdog (unsigned long data) /*fold00*/
spin_lock_irqsave(&sc->lmc_lock, flags);
if(sc->check != 0xBEAFCAFE){
spin_lock_irqsave(&sc->lmc_lock, flags);
if(sc->check != 0xBEAFCAFE){
- printk("LMC: Corrupt net_device stuct, breaking out\n");
+ printk("LMC: Corrupt net_device st
r
uct, breaking out\n");
spin_unlock_irqrestore(&sc->lmc_lock, flags);
return;
}
spin_unlock_irqrestore(&sc->lmc_lock, flags);
return;
}
@@
-724,7
+723,7
@@
static void lmc_watchdog (unsigned long data) /*fold00*/
/* lmc_reset (sc); Why reset??? The link can go down ok */
/* Inform the world that link has been lost */
/* lmc_reset (sc); Why reset??? The link can go down ok */
/* Inform the world that link has been lost */
-
dev->flags &= ~IFF_RUNNING
;
+
netif_carrier_off(dev)
;
}
/*
}
/*
@@
-737,7
+736,7
@@
static void lmc_watchdog (unsigned long data) /*fold00*/
/* lmc_reset (sc); Again why reset??? */
/* Inform the world that link protocol is back up. */
/* lmc_reset (sc); Again why reset??? */
/* Inform the world that link protocol is back up. */
-
dev->flags |= IFF_RUNNING
;
+
netif_carrier_on(dev)
;
/* Now we have to tell the syncppp that we had an outage
* and that it should deal. Calling sppp_reopen here
/* Now we have to tell the syncppp that we had an outage
* and that it should deal. Calling sppp_reopen here
@@
-814,7
+813,6
@@
static void lmc_setup(struct net_device * const dev) /*fold00*/
dev->stop = lmc_close;
dev->get_stats = lmc_get_stats;
dev->do_ioctl = lmc_ioctl;
dev->stop = lmc_close;
dev->get_stats = lmc_get_stats;
dev->do_ioctl = lmc_ioctl;
- dev->set_config = lmc_set_config;
dev->tx_timeout = lmc_driver_timeout;
dev->watchdog_timeo = (HZ); /* 1 second */
dev->tx_timeout = lmc_driver_timeout;
dev->watchdog_timeo = (HZ); /* 1 second */
@@
-1060,7
+1058,7
@@
static int lmc_open (struct net_device *dev) /*fold00*/
lmc_softreset (sc);
/* Since we have to use PCI bus, this should work on x86,alpha,ppc */
lmc_softreset (sc);
/* Since we have to use PCI bus, this should work on x86,alpha,ppc */
- if (request_irq (dev->irq, &lmc_interrupt,
SA_SHIRQ
, dev->name, dev)){
+ if (request_irq (dev->irq, &lmc_interrupt,
IRQF_SHARED
, dev->name, dev)){
printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
lmc_trace(dev, "lmc_open irq failed out");
return -EAGAIN;
printk(KERN_WARNING "%s: could not get irq: %d\n", dev->name, dev->irq);
lmc_trace(dev, "lmc_open irq failed out");
return -EAGAIN;
@@
-1170,8
+1168,6
@@
static void lmc_running_reset (struct net_device *dev) /*fold00*/
sc->lmc_media->set_link_status (sc, 1);
sc->lmc_media->set_status (sc, NULL);
sc->lmc_media->set_link_status (sc, 1);
sc->lmc_media->set_status (sc, NULL);
- //dev->flags |= IFF_RUNNING;
-
netif_wake_queue(dev);
sc->lmc_txfull = 0;
netif_wake_queue(dev);
sc->lmc_txfull = 0;
@@
-1235,8
+1231,6
@@
static int lmc_ifdown (struct net_device *dev) /*fold00*/
csr6 &= ~LMC_DEC_SR; /* Turn off the Receive bit */
LMC_CSR_WRITE (sc, csr_command, csr6);
csr6 &= ~LMC_DEC_SR; /* Turn off the Receive bit */
LMC_CSR_WRITE (sc, csr_command, csr6);
- dev->flags &= ~IFF_RUNNING;
-
sc->stats.rx_missed_errors +=
LMC_CSR_READ (sc, csr_missed_frames) & 0xffff;
sc->stats.rx_missed_errors +=
LMC_CSR_READ (sc, csr_missed_frames) & 0xffff;
@@
-1250,7
+1244,7
@@
static int lmc_ifdown (struct net_device *dev) /*fold00*/
for (i = 0; i < LMC_RXDESCS; i++)
{
struct sk_buff *skb = sc->lmc_rxq[i];
for (i = 0; i < LMC_RXDESCS; i++)
{
struct sk_buff *skb = sc->lmc_rxq[i];
- sc->lmc_rxq[i] =
0
;
+ sc->lmc_rxq[i] =
NULL
;
sc->lmc_rxring[i].status = 0;
sc->lmc_rxring[i].length = 0;
sc->lmc_rxring[i].buffer1 = 0xDEADBEEF;
sc->lmc_rxring[i].status = 0;
sc->lmc_rxring[i].length = 0;
sc->lmc_rxring[i].buffer1 = 0xDEADBEEF;
@@
-1279,7
+1273,7
@@
static int lmc_ifdown (struct net_device *dev) /*fold00*/
/* Interrupt handling routine. This will take an incoming packet, or clean
* up after a trasmit.
*/
/* Interrupt handling routine. This will take an incoming packet, or clean
* up after a trasmit.
*/
-static irqreturn_t lmc_interrupt (int irq, void *dev_instance
, struct pt_regs *regs
) /*fold00*/
+static irqreturn_t lmc_interrupt (int irq, void *dev_instance) /*fold00*/
{
struct net_device *dev = (struct net_device *) dev_instance;
lmc_softc_t *sc;
{
struct net_device *dev = (struct net_device *) dev_instance;
lmc_softc_t *sc;
@@
-1394,7
+1388,7
@@
static irqreturn_t lmc_interrupt (int irq, void *dev_instance, struct pt_regs *r
// dev_kfree_skb(sc->lmc_txq[i]);
dev_kfree_skb_irq(sc->lmc_txq[i]);
// dev_kfree_skb(sc->lmc_txq[i]);
dev_kfree_skb_irq(sc->lmc_txq[i]);
- sc->lmc_txq[i] =
0
;
+ sc->lmc_txq[i] =
NULL
;
badtx++;
i = badtx % LMC_TXDESCS;
badtx++;
i = badtx % LMC_TXDESCS;
@@
-1667,7
+1661,7
@@
static int lmc_rx (struct net_device *dev) /*fold00*/
*/
give_it_anyways:
*/
give_it_anyways:
- sc->lmc_rxq[i] =
0x0
;
+ sc->lmc_rxq[i] =
NULL
;
sc->lmc_rxring[i].buffer1 = 0x0;
skb_put (skb, len);
sc->lmc_rxring[i].buffer1 = 0x0;
skb_put (skb, len);
@@
-1796,7
+1790,7
@@
static struct pci_driver lmc_driver = {
static int __init init_lmc(void)
{
static int __init init_lmc(void)
{
- return pci_
module_init
(&lmc_driver);
+ return pci_
register_driver
(&lmc_driver);
}
static void __exit exit_lmc(void)
}
static void __exit exit_lmc(void)
@@
-1965,7
+1959,7
@@
static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/
dev_kfree_skb(sc->lmc_txq[i]); /* free it */
sc->stats.tx_dropped++; /* We just dropped a packet */
}
dev_kfree_skb(sc->lmc_txq[i]); /* free it */
sc->stats.tx_dropped++; /* We just dropped a packet */
}
- sc->lmc_txq[i] =
0
;
+ sc->lmc_txq[i] =
NULL
;
sc->lmc_txring[i].status = 0x00000000;
sc->lmc_txring[i].buffer2 = virt_to_bus (&sc->lmc_txring[i + 1]);
}
sc->lmc_txring[i].status = 0x00000000;
sc->lmc_txring[i].buffer2 = virt_to_bus (&sc->lmc_txring[i + 1]);
}
@@
-1975,13
+1969,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*/
{
lmc_trace(sc->lmc_device, "lmc_gpio_mkinput in");
void lmc_gpio_mkinput(lmc_softc_t * const sc, u_int32_t bits) /*fold00*/
{
lmc_trace(sc->lmc_device, "lmc_gpio_mkinput in");