aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c505.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/3c505.c')
-rw-r--r--drivers/net/3c505.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index 19c0b856c488..f3a88efc86d6 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -315,11 +315,11 @@ static inline void check_3c505_dma(struct net_device *dev)
315 spin_lock_irqsave(&adapter->lock, flags); 315 spin_lock_irqsave(&adapter->lock, flags);
316 adapter->dmaing = 0; 316 adapter->dmaing = 0;
317 adapter->busy = 0; 317 adapter->busy = 0;
318 318
319 f=claim_dma_lock(); 319 f=claim_dma_lock();
320 disable_dma(dev->dma); 320 disable_dma(dev->dma);
321 release_dma_lock(f); 321 release_dma_lock(f);
322 322
323 if (adapter->rx_active) 323 if (adapter->rx_active)
324 adapter->rx_active--; 324 adapter->rx_active--;
325 outb_control(adapter->hcr_val & ~(DMAE | TCEN | DIR), dev); 325 outb_control(adapter->hcr_val & ~(DMAE | TCEN | DIR), dev);
@@ -660,7 +660,7 @@ static irqreturn_t elp_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr)
660 660
661 dev = dev_id; 661 dev = dev_id;
662 adapter = (elp_device *) dev->priv; 662 adapter = (elp_device *) dev->priv;
663 663
664 spin_lock(&adapter->lock); 664 spin_lock(&adapter->lock);
665 665
666 do { 666 do {
@@ -712,7 +712,7 @@ static irqreturn_t elp_interrupt(int irq, void *dev_id, struct pt_regs *reg_ptr)
712 timeout = jiffies + 3*HZ/100; 712 timeout = jiffies + 3*HZ/100;
713 while ((inb_status(dev->base_addr) & ACRF) != 0 && time_before(jiffies, timeout)) { 713 while ((inb_status(dev->base_addr) & ACRF) != 0 && time_before(jiffies, timeout)) {
714 if (receive_pcb(dev, &adapter->irx_pcb)) { 714 if (receive_pcb(dev, &adapter->irx_pcb)) {
715 switch (adapter->irx_pcb.command) 715 switch (adapter->irx_pcb.command)
716 { 716 {
717 case 0: 717 case 0:
718 break; 718 break;
@@ -889,7 +889,7 @@ static int elp_open(struct net_device *dev)
889 adapter->send_pcb_semaphore = 0; 889 adapter->send_pcb_semaphore = 0;
890 adapter->rx_backlog.in = 0; 890 adapter->rx_backlog.in = 0;
891 adapter->rx_backlog.out = 0; 891 adapter->rx_backlog.out = 0;
892 892
893 spin_lock_init(&adapter->lock); 893 spin_lock_init(&adapter->lock);
894 894
895 /* 895 /*
@@ -1003,7 +1003,7 @@ static int send_packet(struct net_device *dev, struct sk_buff *skb)
1003 } 1003 }
1004 1004
1005 adapter->stats.tx_bytes += nlen; 1005 adapter->stats.tx_bytes += nlen;
1006 1006
1007 /* 1007 /*
1008 * send the adapter a transmit packet command. Ignore segment and offset 1008 * send the adapter a transmit packet command. Ignore segment and offset
1009 * and make sure the length is even 1009 * and make sure the length is even
@@ -1044,7 +1044,7 @@ static int send_packet(struct net_device *dev, struct sk_buff *skb)
1044 outb_control(adapter->hcr_val | DMAE | TCEN, dev); 1044 outb_control(adapter->hcr_val | DMAE | TCEN, dev);
1045 enable_dma(dev->dma); 1045 enable_dma(dev->dma);
1046 release_dma_lock(flags); 1046 release_dma_lock(flags);
1047 1047
1048 if (elp_debug >= 3) 1048 if (elp_debug >= 3)
1049 printk(KERN_DEBUG "%s: DMA transfer started\n", dev->name); 1049 printk(KERN_DEBUG "%s: DMA transfer started\n", dev->name);
1050 1050
@@ -1054,7 +1054,7 @@ static int send_packet(struct net_device *dev, struct sk_buff *skb)
1054/* 1054/*
1055 * The upper layer thinks we timed out 1055 * The upper layer thinks we timed out
1056 */ 1056 */
1057 1057
1058static void elp_timeout(struct net_device *dev) 1058static void elp_timeout(struct net_device *dev)
1059{ 1059{
1060 elp_device *adapter = dev->priv; 1060 elp_device *adapter = dev->priv;
@@ -1080,7 +1080,7 @@ static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
1080{ 1080{
1081 unsigned long flags; 1081 unsigned long flags;
1082 elp_device *adapter = dev->priv; 1082 elp_device *adapter = dev->priv;
1083 1083
1084 spin_lock_irqsave(&adapter->lock, flags); 1084 spin_lock_irqsave(&adapter->lock, flags);
1085 check_3c505_dma(dev); 1085 check_3c505_dma(dev);
1086 1086
@@ -1088,7 +1088,7 @@ static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
1088 printk(KERN_DEBUG "%s: request to send packet of length %d\n", dev->name, (int) skb->len); 1088 printk(KERN_DEBUG "%s: request to send packet of length %d\n", dev->name, (int) skb->len);
1089 1089
1090 netif_stop_queue(dev); 1090 netif_stop_queue(dev);
1091 1091
1092 /* 1092 /*
1093 * send the packet at skb->data for skb->len 1093 * send the packet at skb->data for skb->len
1094 */ 1094 */
@@ -1235,7 +1235,7 @@ static void elp_set_mc_list(struct net_device *dev)
1235 printk(KERN_DEBUG "%s: request to set multicast list\n", dev->name); 1235 printk(KERN_DEBUG "%s: request to set multicast list\n", dev->name);
1236 1236
1237 spin_lock_irqsave(&adapter->lock, flags); 1237 spin_lock_irqsave(&adapter->lock, flags);
1238 1238
1239 if (!(dev->flags & (IFF_PROMISC | IFF_ALLMULTI))) { 1239 if (!(dev->flags & (IFF_PROMISC | IFF_ALLMULTI))) {
1240 /* send a "load multicast list" command to the board, max 10 addrs/cmd */ 1240 /* send a "load multicast list" command to the board, max 10 addrs/cmd */
1241 /* if num_addrs==0 the list will be cleared */ 1241 /* if num_addrs==0 the list will be cleared */