Skip to content

L
linux
Commit be9332c2 authored by Adrian Bunk's avatar Adrian Bunk Committed by Jeff Garzik
Browse files
Options

[wan lmc] remove 2.0.x-era code 

The patch below removes obsolete #if'd code for kernel 2.0 and 2.2 from
drivers/net/wan/lmc/* (this includes the expansion of some #define's 
that were definded differently for different kernel versions).
parent 95a52644
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 165 deletions
drivers/net/wan/lmc/lmc_debug.c
View file @ be9332c2
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/version.h>
#include "lmc_ver.h"
#include "lmc_debug.h" #include "lmc_debug.h"
/* /*
......
drivers/net/wan/lmc/lmc_main.c
View file @ be9332c2
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* With Help By: * With Help By:
* David Boggs * David Boggs
* Ron Crane * Ron Crane
* Allan Cox * Alan Cox
* *
* This software may be used and distributed according to the terms * This software may be used and distributed according to the terms
* of the GNU General Public License version 2, incorporated herein by reference. * of the GNU General Public License version 2, incorporated herein by reference.
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
/* $Id: lmc_main.c,v 1.36 2000/04/11 05:25:25 asj Exp $ */ /* $Id: lmc_main.c,v 1.36 2000/04/11 05:25:25 asj Exp $ */
#include <linux/version.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -51,9 +50,6 @@ ...@@ -51,9 +50,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/init.h> #include <linux/init.h>
#if LINUX_VERSION_CODE < 0x20155
#include <linux/bios32.h>
#endif
#include <linux/in.h> #include <linux/in.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
...@@ -67,12 +63,8 @@ ...@@ -67,12 +63,8 @@
#include <asm/bitops.h> #include <asm/bitops.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/dma.h> #include <asm/dma.h>
#if LINUX_VERSION_CODE >= 0x20200
#include <asm/uaccess.h> #include <asm/uaccess.h>
//#include <asm/spinlock.h> //#include <asm/spinlock.h>
#else /* 2.0 kernel */
#define ARPHRD_HDLC 513
#endif
#define DRIVER_MAJOR_VERSION 1 #define DRIVER_MAJOR_VERSION 1
#define DRIVER_MINOR_VERSION 34 #define DRIVER_MINOR_VERSION 34
...@@ -80,7 +72,6 @@ ...@@ -80,7 +72,6 @@
#define DRIVER_VERSION ((DRIVER_MAJOR_VERSION << 8) + DRIVER_MINOR_VERSION) #define DRIVER_VERSION ((DRIVER_MAJOR_VERSION << 8) + DRIVER_MINOR_VERSION)
#include "lmc_ver.h"
#include "lmc.h" #include "lmc.h"
#include "lmc_var.h" #include "lmc_var.h"
#include "lmc_ioctl.h" #include "lmc_ioctl.h"
...@@ -127,10 +118,8 @@ static void lmc_watchdog(unsigned long data); ...@@ -127,10 +118,8 @@ static void lmc_watchdog(unsigned long data);
static int lmc_init(struct net_device * const); static int lmc_init(struct net_device * const);
static void lmc_reset(lmc_softc_t * const sc); static void lmc_reset(lmc_softc_t * const sc);
static void lmc_dec_reset(lmc_softc_t * const sc); static void lmc_dec_reset(lmc_softc_t * const sc);
#if LINUX_VERSION_CODE >= 0x20363
static void lmc_driver_timeout(struct net_device *dev); static void lmc_driver_timeout(struct net_device *dev);
int lmc_setup(void); int lmc_setup(void);
#endif
/* /*
...@@ -165,7 +154,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ ...@@ -165,7 +154,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
* To date internally, just copy this out to the user. * To date internally, just copy this out to the user.
*/ */
case LMCIOCGINFO: /*fold01*/ case LMCIOCGINFO: /*fold01*/
LMC_COPY_TO_USER(ifr->ifr_data, &sc->ictl, sizeof (lmc_ctl_t)); if (copy_to_user(ifr->ifr_data, &sc->ictl, sizeof (lmc_ctl_t)))
return -EFAULT;
ret = 0; ret = 0;
break; break;
...@@ -181,7 +171,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ ...@@ -181,7 +171,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
break; break;
} }
LMC_COPY_FROM_USER(&ctl, ifr->ifr_data, sizeof (lmc_ctl_t)); if (copy_from_user(&ctl, ifr->ifr_data, sizeof (lmc_ctl_t)))
return -EFAULT;
sc->lmc_media->set_status (sc, &ctl); sc->lmc_media->set_status (sc, &ctl);
...@@ -211,7 +202,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ ...@@ -211,7 +202,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
break; break;
} }
LMC_COPY_FROM_USER(&new_type, ifr->ifr_data, sizeof(u_int16_t)); if (copy_from_user(&new_type, ifr->ifr_data, sizeof(u_int16_t)))
return -EFAULT;
if (new_type == old_type) if (new_type == old_type)
...@@ -248,8 +240,9 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ ...@@ -248,8 +240,9 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
sc->lmc_xinfo.Magic1 = 0xDEADBEEF; sc->lmc_xinfo.Magic1 = 0xDEADBEEF;
LMC_COPY_TO_USER(ifr->ifr_data, &sc->lmc_xinfo, if (copy_to_user(ifr->ifr_data, &sc->lmc_xinfo,
sizeof (struct lmc_xinfo)); sizeof (struct lmc_xinfo)))
return -EFAULT;
ret = 0; ret = 0;
break; break;
...@@ -279,8 +272,9 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ ...@@ -279,8 +272,9 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
regVal & T1FRAMER_SEF_MASK; regVal & T1FRAMER_SEF_MASK;
} }
LMC_COPY_TO_USER(ifr->ifr_data, &sc->stats, if (copy_to_user(ifr->ifr_data, &sc->stats,
sizeof (struct lmc_statistics)); sizeof (struct lmc_statistics)))
return -EFAULT;
ret = 0; ret = 0;
break; break;
...@@ -310,7 +304,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ ...@@ -310,7 +304,8 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
break; break;
} }
LMC_COPY_FROM_USER(&ctl, ifr->ifr_data, sizeof (lmc_ctl_t)); if (copy_from_user(&ctl, ifr->ifr_data, sizeof (lmc_ctl_t)))
return -EFAULT;
sc->lmc_media->set_circuit_type(sc, ctl.circuit_type); sc->lmc_media->set_circuit_type(sc, ctl.circuit_type);
sc->ictl.circuit_type = ctl.circuit_type; sc->ictl.circuit_type = ctl.circuit_type;
ret = 0; ret = 0;
...@@ -335,8 +330,10 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ ...@@ -335,8 +330,10 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
#ifdef DEBUG #ifdef DEBUG
case LMCIOCDUMPEVENTLOG: case LMCIOCDUMPEVENTLOG:
LMC_COPY_TO_USER(ifr->ifr_data, &lmcEventLogIndex, sizeof (u32)); if (copy_to_user(ifr->ifr_data, &lmcEventLogIndex, sizeof (u32)))
LMC_COPY_TO_USER(ifr->ifr_data + sizeof (u32), lmcEventLogBuf, sizeof (lmcEventLogBuf)); return -EFAULT;
if (copy_to_user(ifr->ifr_data + sizeof (u32), lmcEventLogBuf, sizeof (lmcEventLogBuf)))
return -EFAULT;
ret = 0; ret = 0;
break; break;
...@@ -359,9 +356,10 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ ...@@ -359,9 +356,10 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
/* /*
* Stop the xwitter whlie we restart the hardware * Stop the xwitter whlie we restart the hardware
*/ */
LMC_XMITTER_BUSY(dev); netif_stop_queue(dev);
LMC_COPY_FROM_USER(&xc, ifr->ifr_data, sizeof (struct lmc_xilinx_control)); if (copy_from_user(&xc, ifr->ifr_data, sizeof (struct lmc_xilinx_control)))
return -EFAULT;
switch(xc.command){ switch(xc.command){
case lmc_xilinx_reset: /*fold02*/ case lmc_xilinx_reset: /*fold02*/
{ {
...@@ -620,7 +618,7 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ ...@@ -620,7 +618,7 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/
break; break;
} }
LMC_XMITTER_FREE(dev); netif_wake_queue(dev);
sc->lmc_txfull = 0; sc->lmc_txfull = 0;
} }
...@@ -646,7 +644,7 @@ static void lmc_watchdog (unsigned long data) /*fold00*/ ...@@ -646,7 +644,7 @@ static void lmc_watchdog (unsigned long data) /*fold00*/
lmc_softc_t *sc; lmc_softc_t *sc;
int link_status; int link_status;
u_int32_t ticks; u_int32_t ticks;
LMC_SPIN_FLAGS; unsigned long flags;
sc = dev->priv; sc = dev->priv;
...@@ -836,11 +834,7 @@ static struct net_device *lmc_probe1 (struct net_device *dev, unsigned long ioad ...@@ -836,11 +834,7 @@ static struct net_device *lmc_probe1 (struct net_device *dev, unsigned long ioad
* Allocate our own device structure * Allocate our own device structure
*/ */
#if LINUX_VERSION_CODE < 0x20363
dev = kmalloc (sizeof (struct ppp_device)+8, GFP_KERNEL);
#else
dev = kmalloc (sizeof (struct net_device)+8, GFP_KERNEL); dev = kmalloc (sizeof (struct net_device)+8, GFP_KERNEL);
#endif
if (dev == NULL){ if (dev == NULL){
printk (KERN_ERR "lmc: kmalloc for device failed\n"); printk (KERN_ERR "lmc: kmalloc for device failed\n");
return NULL; return NULL;
...@@ -909,10 +903,8 @@ static struct net_device *lmc_probe1 (struct net_device *dev, unsigned long ioad ...@@ -909,10 +903,8 @@ static struct net_device *lmc_probe1 (struct net_device *dev, unsigned long ioad
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->set_config = lmc_set_config;
#if LINUX_VERSION_CODE >= 0x20363
dev->tx_timeout = lmc_driver_timeout; dev->tx_timeout = lmc_driver_timeout;
dev->watchdog_timeo = (HZ); /* 1 second */ dev->watchdog_timeo = (HZ); /* 1 second */
#endif
/* /*
* Why were we changing this??? * Why were we changing this???
...@@ -923,8 +915,6 @@ static struct net_device *lmc_probe1 (struct net_device *dev, unsigned long ioad ...@@ -923,8 +915,6 @@ static struct net_device *lmc_probe1 (struct net_device *dev, unsigned long ioad
spin_lock_init(&sc->lmc_lock); spin_lock_init(&sc->lmc_lock);
LMC_SETUP_20_DEV;
printk ("%s: detected at %lx, irq %d\n", dev->name, ioaddr, dev->irq); printk ("%s: detected at %lx, irq %d\n", dev->name, ioaddr, dev->irq);
if (register_netdev (dev) != 0) { if (register_netdev (dev) != 0) {
...@@ -1048,7 +1038,7 @@ int lmc_probe (struct net_device *dev) /*fold00*/ ...@@ -1048,7 +1038,7 @@ int lmc_probe (struct net_device *dev) /*fold00*/
* PCI bus, we are in trouble. * PCI bus, we are in trouble.
*/ */
if (!LMC_PCI_PRESENT()) { if (!pci_present()) {
/* printk ("%s: We really want a pci bios!\n", dev->name);*/ /* printk ("%s: We really want a pci bios!\n", dev->name);*/
return -1; return -1;
} }
...@@ -1124,11 +1114,7 @@ int lmc_probe (struct net_device *dev) /*fold00*/ ...@@ -1124,11 +1114,7 @@ int lmc_probe (struct net_device *dev) /*fold00*/
if (cards_found < 1) if (cards_found < 1)
return -1; return -1;
#if LINUX_VERSION_CODE >= 0x20200
return foundaddr; return foundaddr;
#else
return 0;
#endif
} }
/* After this is called, packets can be sent. /* After this is called, packets can be sent.
...@@ -1199,11 +1185,7 @@ static int lmc_open (struct net_device *dev) /*fold00*/ ...@@ -1199,11 +1185,7 @@ static int lmc_open (struct net_device *dev) /*fold00*/
dev->do_ioctl = lmc_ioctl; dev->do_ioctl = lmc_ioctl;
LMC_XMITTER_INIT(dev); netif_start_queue(dev);
#if LINUX_VERSION_CODE < 0x20363
dev->start = 1;
#endif
sc->stats.tx_tbusy0++ ; sc->stats.tx_tbusy0++ ;
...@@ -1277,7 +1259,7 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/ ...@@ -1277,7 +1259,7 @@ static void lmc_running_reset (struct net_device *dev) /*fold00*/
//dev->flags |= IFF_RUNNING; //dev->flags |= IFF_RUNNING;
LMC_XMITTER_FREE(dev); netif_wake_queue(dev);
sc->lmc_txfull = 0; sc->lmc_txfull = 0;
sc->stats.tx_tbusy0++ ; sc->stats.tx_tbusy0++ ;
...@@ -1327,7 +1309,7 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/ ...@@ -1327,7 +1309,7 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/
/* Don't let anything else go on right now */ /* Don't let anything else go on right now */
// dev->start = 0; // dev->start = 0;
LMC_XMITTER_BUSY(dev); netif_stop_queue(dev);
sc->stats.tx_tbusy1++ ; sc->stats.tx_tbusy1++ ;
/* stop interrupts */ /* stop interrupts */
...@@ -1360,23 +1342,20 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/ ...@@ -1360,23 +1342,20 @@ static int lmc_ifdown (struct net_device *dev) /*fold00*/
sc->lmc_rxring[i].length = 0; sc->lmc_rxring[i].length = 0;
sc->lmc_rxring[i].buffer1 = 0xDEADBEEF; sc->lmc_rxring[i].buffer1 = 0xDEADBEEF;
if (skb != NULL) if (skb != NULL)
{ dev_kfree_skb(skb);
LMC_SKB_FREE(skb, 1);
LMC_DEV_KFREE_SKB (skb);
}
sc->lmc_rxq[i] = NULL; sc->lmc_rxq[i] = NULL;
} }
for (i = 0; i < LMC_TXDESCS; i++) for (i = 0; i < LMC_TXDESCS; i++)
{ {
if (sc->lmc_txq[i] != NULL) if (sc->lmc_txq[i] != NULL)
LMC_DEV_KFREE_SKB (sc->lmc_txq[i]); dev_kfree_skb(sc->lmc_txq[i]);
sc->lmc_txq[i] = NULL; sc->lmc_txq[i] = NULL;
} }
lmc_led_off (sc, LMC_MII16_LED_ALL); lmc_led_off (sc, LMC_MII16_LED_ALL);
LMC_XMITTER_FREE(dev); netif_wake_queue(dev);
sc->stats.tx_tbusy0++ ; sc->stats.tx_tbusy0++ ;
lmc_trace(dev, "lmc_ifdown out"); lmc_trace(dev, "lmc_ifdown out");
...@@ -1496,14 +1475,12 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance, struct pt_regs *r ...@@ -1496,14 +1475,12 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance, struct pt_regs *r
} }
else { else {
#if LINUX_VERSION_CODE >= 0x20200
sc->stats.tx_bytes += sc->lmc_txring[i].length & 0x7ff; sc->stats.tx_bytes += sc->lmc_txring[i].length & 0x7ff;
#endif
sc->stats.tx_packets++; sc->stats.tx_packets++;
} }
// LMC_DEV_KFREE_SKB (sc->lmc_txq[i]); // dev_kfree_skb(sc->lmc_txq[i]);
dev_kfree_skb_irq(sc->lmc_txq[i]); dev_kfree_skb_irq(sc->lmc_txq[i]);
sc->lmc_txq[i] = 0; sc->lmc_txq[i] = 0;
...@@ -1518,20 +1495,14 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance, struct pt_regs *r ...@@ -1518,20 +1495,14 @@ static irqreturn_t lmc_interrupt (int irq, void *dev_instance, struct pt_regs *r
} }
LMC_EVENT_LOG(LMC_EVENT_TBUSY0, n_compl, 0); LMC_EVENT_LOG(LMC_EVENT_TBUSY0, n_compl, 0);
sc->lmc_txfull = 0; sc->lmc_txfull = 0;
LMC_XMITTER_FREE(dev); netif_wake_queue(dev);
sc->stats.tx_tbusy0++ ; sc->stats.tx_tbusy0++ ;
#if LINUX_VERSION_CODE < 0x20363
mark_bh (NET_BH); /* Tell Linux to give me more packets */
#endif
#ifdef DEBUG #ifdef DEBUG
sc->stats.dirtyTx = badtx; sc->stats.dirtyTx = badtx;
sc->stats.lmc_next_tx = sc->lmc_next_tx; sc->stats.lmc_next_tx = sc->lmc_next_tx;
sc->stats.lmc_txfull = sc->lmc_txfull; sc->stats.lmc_txfull = sc->lmc_txfull;
#if LINUX_VERSION_CODE < 0x20363
sc->stats.tbusy = dev->tbusy;
#endif
#endif #endif
sc->lmc_taint_tx = badtx; sc->lmc_taint_tx = badtx;
...@@ -1592,7 +1563,7 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00 ...@@ -1592,7 +1563,7 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00
u32 flag; u32 flag;
int entry; int entry;
int ret = 0; int ret = 0;
LMC_SPIN_FLAGS; unsigned long flags;
lmc_trace(dev, "lmc_start_xmit in"); lmc_trace(dev, "lmc_start_xmit in");
...@@ -1600,60 +1571,6 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00 ...@@ -1600,60 +1571,6 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00
spin_lock_irqsave(&sc->lmc_lock, flags); spin_lock_irqsave(&sc->lmc_lock, flags);
/*
* If the transmitter is busy
* this must be the 5 second polling
* from the kernel which called us.
* Poke the chip and try to get it running
*
*/
#if LINUX_VERSION_CODE < 0x20363
if(dev->tbusy != 0){
u32 csr6;
printk("%s: Xmitter busy|\n", dev->name);
sc->stats.tx_tbusy_calls++ ;
if (jiffies - dev->trans_start < TX_TIMEOUT) {
ret = 1;
goto lmc_start_xmit_bug_out;
}
/*
* Chip seems to have locked up
* Reset it
* This whips out all our decriptor
* table and starts from scartch
*/
LMC_EVENT_LOG(LMC_EVENT_XMTPRCTMO,
LMC_CSR_READ (sc, csr_status),
sc->stats.tx_ProcTimeout);
lmc_running_reset (dev);
LMC_EVENT_LOG(LMC_EVENT_RESET1, LMC_CSR_READ (sc, csr_status), 0);
LMC_EVENT_LOG(LMC_EVENT_RESET2,
lmc_mii_readreg (sc, 0, 16),
lmc_mii_readreg (sc, 0, 17));
/* restart the tx processes */
csr6 = LMC_CSR_READ (sc, csr_command);
LMC_CSR_WRITE (sc, csr_command, csr6 | 0x0002);
LMC_CSR_WRITE (sc, csr_command, csr6 | 0x2002);
/* immediate transmit */
LMC_CSR_WRITE (sc, csr_txpoll, 0);
sc->stats.tx_errors++;
sc->stats.tx_ProcTimeout++; /* -baz */
dev->trans_start = jiffies;
ret = 1;
goto lmc_start_xmit_bug_out;
}
#endif
/* normal path, tbusy known to be zero */ /* normal path, tbusy known to be zero */
entry = sc->lmc_next_tx % LMC_TXDESCS; entry = sc->lmc_next_tx % LMC_TXDESCS;
...@@ -1669,26 +1586,26 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00 ...@@ -1669,26 +1586,26 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00
{ {
/* Do not interrupt on completion of this packet */ /* Do not interrupt on completion of this packet */
flag = 0x60000000; flag = 0x60000000;
LMC_XMITTER_FREE(dev); netif_wake_queue(dev);
} }
else if (sc->lmc_next_tx - sc->lmc_taint_tx == LMC_TXDESCS / 2) else if (sc->lmc_next_tx - sc->lmc_taint_tx == LMC_TXDESCS / 2)
{ {
/* This generates an interrupt on completion of this packet */ /* This generates an interrupt on completion of this packet */
flag = 0xe0000000; flag = 0xe0000000;
LMC_XMITTER_FREE(dev); netif_wake_queue(dev);
} }
else if (sc->lmc_next_tx - sc->lmc_taint_tx < LMC_TXDESCS - 1) else if (sc->lmc_next_tx - sc->lmc_taint_tx < LMC_TXDESCS - 1)
{ {
/* Do not interrupt on completion of this packet */ /* Do not interrupt on completion of this packet */
flag = 0x60000000; flag = 0x60000000;
LMC_XMITTER_FREE(dev); netif_wake_queue(dev);
} }
else else
{ {
/* This generates an interrupt on completion of this packet */ /* This generates an interrupt on completion of this packet */
flag = 0xe0000000; flag = 0xe0000000;
sc->lmc_txfull = 1; sc->lmc_txfull = 1;
LMC_XMITTER_BUSY(dev); netif_stop_queue(dev);
} }
#else #else
flag = LMC_TDES_INTERRUPT_ON_COMPLETION; flag = LMC_TDES_INTERRUPT_ON_COMPLETION;
...@@ -1696,7 +1613,7 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00 ...@@ -1696,7 +1613,7 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00
if (sc->lmc_next_tx - sc->lmc_taint_tx >= LMC_TXDESCS - 1) if (sc->lmc_next_tx - sc->lmc_taint_tx >= LMC_TXDESCS - 1)
{ /* ring full, go busy */ { /* ring full, go busy */
sc->lmc_txfull = 1; sc->lmc_txfull = 1;
LMC_XMITTER_BUSY(dev); netif_stop_queue(dev);
sc->stats.tx_tbusy1++ ; sc->stats.tx_tbusy1++ ;
LMC_EVENT_LOG(LMC_EVENT_TBUSY1, entry, 0); LMC_EVENT_LOG(LMC_EVENT_TBUSY1, entry, 0);
} }
...@@ -1726,10 +1643,6 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00 ...@@ -1726,10 +1643,6 @@ static int lmc_start_xmit (struct sk_buff *skb, struct net_device *dev) /*fold00
dev->trans_start = jiffies; dev->trans_start = jiffies;
#if LINUX_VERSION_CODE < 0x20363
lmc_start_xmit_bug_out:
#endif
spin_unlock_irqrestore(&sc->lmc_lock, flags); spin_unlock_irqrestore(&sc->lmc_lock, flags);
lmc_trace(dev, "lmc_start_xmit_out"); lmc_trace(dev, "lmc_start_xmit_out");
...@@ -1815,7 +1728,6 @@ static int lmc_rx (struct net_device *dev) /*fold00*/ ...@@ -1815,7 +1728,6 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
if(skb == 0x0){ if(skb == 0x0){
nsb = dev_alloc_skb (LMC_PKT_BUF_SZ + 2); nsb = dev_alloc_skb (LMC_PKT_BUF_SZ + 2);
if (nsb) { if (nsb) {
LMC_SKB_FREE(nsb, 1);
sc->lmc_rxq[i] = nsb; sc->lmc_rxq[i] = nsb;
nsb->dev = dev; nsb->dev = dev;
sc->lmc_rxring[i].buffer1 = virt_to_bus (nsb->tail); sc->lmc_rxring[i].buffer1 = virt_to_bus (nsb->tail);
...@@ -1859,7 +1771,6 @@ static int lmc_rx (struct net_device *dev) /*fold00*/ ...@@ -1859,7 +1771,6 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
*/ */
nsb = dev_alloc_skb (LMC_PKT_BUF_SZ + 2); nsb = dev_alloc_skb (LMC_PKT_BUF_SZ + 2);
if (nsb) { if (nsb) {
LMC_SKB_FREE(nsb, 1);
sc->lmc_rxq[i] = nsb; sc->lmc_rxq[i] = nsb;
nsb->dev = dev; nsb->dev = dev;
sc->lmc_rxring[i].buffer1 = virt_to_bus (nsb->tail); sc->lmc_rxring[i].buffer1 = virt_to_bus (nsb->tail);
...@@ -1948,7 +1859,7 @@ static int lmc_rx (struct net_device *dev) /*fold00*/ ...@@ -1948,7 +1859,7 @@ static int lmc_rx (struct net_device *dev) /*fold00*/
static struct net_device_stats *lmc_get_stats (struct net_device *dev) /*fold00*/ static struct net_device_stats *lmc_get_stats (struct net_device *dev) /*fold00*/
{ {
lmc_softc_t *sc; lmc_softc_t *sc;
LMC_SPIN_FLAGS; unsigned long flags;
lmc_trace(dev, "lmc_get_stats in"); lmc_trace(dev, "lmc_get_stats in");
...@@ -2148,7 +2059,6 @@ static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/ ...@@ -2148,7 +2059,6 @@ static void lmc_softreset (lmc_softc_t * const sc) /*fold00*/
} }
skb->dev = sc->lmc_device; skb->dev = sc->lmc_device;
LMC_SKB_FREE(skb, 1);
/* owned by 21140 */ /* owned by 21140 */
sc->lmc_rxring[i].status = 0x80000000; sc->lmc_rxring[i].status = 0x80000000;
...@@ -2367,11 +2277,10 @@ static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, /*fold00 ...@@ -2367,11 +2277,10 @@ static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, /*fold00
lmc_trace(sc->lmc_device, "lmc_initcsrs out"); lmc_trace(sc->lmc_device, "lmc_initcsrs out");
} }
#if LINUX_VERSION_CODE >= 0x20363
static void lmc_driver_timeout(struct net_device *dev) { /*fold00*/ static void lmc_driver_timeout(struct net_device *dev) { /*fold00*/
lmc_softc_t *sc; lmc_softc_t *sc;
u32 csr6; u32 csr6;
LMC_SPIN_FLAGS; unsigned long flags;
lmc_trace(dev, "lmc_driver_timeout in"); lmc_trace(dev, "lmc_driver_timeout in");
...@@ -2430,4 +2339,3 @@ int lmc_setup(void) { /*FOLD00*/ ...@@ -2430,4 +2339,3 @@ int lmc_setup(void) { /*FOLD00*/
return lmc_probe(NULL); return lmc_probe(NULL);
} }
#endif
drivers/net/wan/lmc/lmc_media.c
View file @ be9332c2
/* $Id: lmc_media.c,v 1.13 2000/04/11 05:25:26 asj Exp $ */ /* $Id: lmc_media.c,v 1.13 2000/04/11 05:25:26 asj Exp $ */
#include <linux/version.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
...@@ -11,9 +10,6 @@ ...@@ -11,9 +10,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/pci.h> #include <linux/pci.h>
#if LINUX_VERSION_CODE < 0x20155
#include <linux/bios32.h>
#endif
#include <linux/in.h> #include <linux/in.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
...@@ -28,11 +24,8 @@ ...@@ -28,11 +24,8 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/dma.h> #include <asm/dma.h>
#if LINUX_VERSION_CODE >= 0x20200
#include <asm/uaccess.h> #include <asm/uaccess.h>
#endif
#include "lmc_ver.h"
#include "lmc.h" #include "lmc.h"
#include "lmc_var.h" #include "lmc_var.h"
#include "lmc_ioctl.h" #include "lmc_ioctl.h"
......
drivers/net/wan/lmc/lmc_proto.c
View file @ be9332c2
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
* Driver for the LanMedia LMC5200, LMC5245, LMC1000, LMC1200 cards. * Driver for the LanMedia LMC5200, LMC5245, LMC1000, LMC1200 cards.
*/ */
#include <linux/version.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/timer.h> #include <linux/timer.h>
...@@ -46,7 +45,6 @@ ...@@ -46,7 +45,6 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/smp.h> #include <asm/smp.h>
#include "lmc_ver.h"
#include "lmc.h" #include "lmc.h"
#include "lmc_var.h" #include "lmc_var.h"
#include "lmc_debug.h" #include "lmc_debug.h"
...@@ -66,14 +64,6 @@ ...@@ -66,14 +64,6 @@
#define SPPP_attach(d) (void)0 #define SPPP_attach(d) (void)0
#define SPPP_do_ioctl(d,i,c) -EOPNOTSUPP #define SPPP_do_ioctl(d,i,c) -EOPNOTSUPP
#else #else
#if LINUX_VERSION_CODE < 0x20363
#define SPPP_attach(x) sppp_attach((struct ppp_device *)(x)->lmc_device)
#define SPPP_detach(x) sppp_detach((x)->lmc_device)
#define SPPP_open(x) sppp_open((x)->lmc_device)
#define SPPP_reopen(x) sppp_reopen((x)->lmc_device)
#define SPPP_close(x) sppp_close((x)->lmc_device)
#define SPPP_do_ioctl(x, y, z) sppp_do_ioctl((x)->lmc_device, (y), (z))
#else
#define SPPP_attach(x) sppp_attach((x)->pd) #define SPPP_attach(x) sppp_attach((x)->pd)
#define SPPP_detach(x) sppp_detach((x)->pd->dev) #define SPPP_detach(x) sppp_detach((x)->pd->dev)
#define SPPP_open(x) sppp_open((x)->pd->dev) #define SPPP_open(x) sppp_open((x)->pd->dev)
...@@ -81,7 +71,6 @@ ...@@ -81,7 +71,6 @@
#define SPPP_close(x) sppp_close((x)->pd->dev) #define SPPP_close(x) sppp_close((x)->pd->dev)
#define SPPP_do_ioctl(x, y, z) sppp_do_ioctl((x)->pd->dev, (y), (z)) #define SPPP_do_ioctl(x, y, z) sppp_do_ioctl((x)->pd->dev, (y), (z))
#endif #endif
#endif
// init // init
void lmc_proto_init(lmc_softc_t *sc) /*FOLD00*/ void lmc_proto_init(lmc_softc_t *sc) /*FOLD00*/
...@@ -89,15 +78,12 @@ void lmc_proto_init(lmc_softc_t *sc) /*FOLD00*/ ...@@ -89,15 +78,12 @@ void lmc_proto_init(lmc_softc_t *sc) /*FOLD00*/
lmc_trace(sc->lmc_device, "lmc_proto_init in"); lmc_trace(sc->lmc_device, "lmc_proto_init in");
switch(sc->if_type){ switch(sc->if_type){
case LMC_PPP: case LMC_PPP:
#if LINUX_VERSION_CODE >= 0x20363
sc->pd = kmalloc(sizeof(struct ppp_device), GFP_KERNEL); sc->pd = kmalloc(sizeof(struct ppp_device), GFP_KERNEL);
if (!sc->pd) { if (!sc->pd) {
printk("lmc_proto_init(): kmalloc failure!\n"); printk("lmc_proto_init(): kmalloc failure!\n");
return; return;
} }
sc->pd->dev = sc->lmc_device; sc->pd->dev = sc->lmc_device;
#endif
sc->if_ptr = sc->pd; sc->if_ptr = sc->pd;
break; break;
case LMC_RAW: case LMC_RAW:
......
drivers/net/wan/lmc/lmc_var.h
View file @ be9332c2
...@@ -48,9 +48,6 @@ typedef struct lmc___ctl lmc_ctl_t; ...@@ -48,9 +48,6 @@ typedef struct lmc___ctl lmc_ctl_t;
#define u_int16_t u16 #define u_int16_t u16
#define u_int8_t u8 #define u_int8_t u8
#define tulip_uint32_t u32 #define tulip_uint32_t u32
#if LINUX_VERSION_CODE < 0x20155
#define u_int32_t u32
#endif
#define LMC_REG_RANGE 0x80 #define LMC_REG_RANGE 0x80
...@@ -410,9 +407,7 @@ struct lmc___softc { ...@@ -410,9 +407,7 @@ struct lmc___softc {
u32 last_int; u32 last_int;
u32 num_int; u32 num_int;
#if LINUX_VERSION_CODE >= 0x20200
spinlock_t lmc_lock; spinlock_t lmc_lock;
#endif
u_int16_t if_type; /* PPP or NET */ u_int16_t if_type; /* PPP or NET */
struct ppp_device *pd; struct ppp_device *pd;
...@@ -550,10 +545,6 @@ struct lmc___softc { ...@@ -550,10 +545,6 @@ struct lmc___softc {
#define LMC_CRC_LEN_16 2 /* 16-bit CRC */ #define LMC_CRC_LEN_16 2 /* 16-bit CRC */
#define LMC_CRC_LEN_32 4 #define LMC_CRC_LEN_32 4
#if LINUX_VERSION_CODE < 0x20100
#define test_and_set_bit(val, addr) set_bit(val, addr)
#endif
#ifdef LMC_HDLC #ifdef LMC_HDLC
/* definition of an hdlc header. */ /* definition of an hdlc header. */
struct hdlc_hdr struct hdlc_hdr
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7