aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibmlana.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ibmlana.c')
-rw-r--r--drivers/net/ibmlana.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index 294ccfb427cf..a7d6cad32953 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -23,7 +23,7 @@ paper sources:
23 'LAN Technical Reference Ethernet Adapter Interface Version 1 Release 1.0 23 'LAN Technical Reference Ethernet Adapter Interface Version 1 Release 1.0
24 Document Number SC30-3661-00' by IBM for info on the adapter itself 24 Document Number SC30-3661-00' by IBM for info on the adapter itself
25 25
26 Also see http://www.natsemi.com/ 26 Also see http://www.national.com/analog
27 27
28special acknowledgements to: 28special acknowledgements to:
29 - Bob Eager for helping me out with documentation from IBM 29 - Bob Eager for helping me out with documentation from IBM
@@ -53,7 +53,7 @@ History:
53 still work with 2.0.x.... 53 still work with 2.0.x....
54 Jan 28th, 2000 54 Jan 28th, 2000
55 in Linux 2.2.13, the version.h file mysteriously didn't get 55 in Linux 2.2.13, the version.h file mysteriously didn't get
56 included. Added a workaround for this. Futhermore, it now 56 included. Added a workaround for this. Furthermore, it now
57 not only compiles as a modules ;-) 57 not only compiles as a modules ;-)
58 Jan 30th, 2000 58 Jan 30th, 2000
59 newer kernels automatically probe more than one board, so the 59 newer kernels automatically probe more than one board, so the
@@ -481,7 +481,7 @@ static void InitBoard(struct net_device *dev)
481 if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > camcnt) 481 if ((dev->flags & IFF_ALLMULTI) || netdev_mc_count(dev) > camcnt)
482 rcrval |= RCREG_AMC; 482 rcrval |= RCREG_AMC;
483 483
484 /* promiscous mode ? */ 484 /* promiscuous mode ? */
485 485
486 if (dev->flags & IFF_PROMISC) 486 if (dev->flags & IFF_PROMISC)
487 rcrval |= RCREG_PRO; 487 rcrval |= RCREG_PRO;
@@ -602,7 +602,7 @@ static void irqrx_handler(struct net_device *dev)
602 /* set up skb fields */ 602 /* set up skb fields */
603 603
604 skb->protocol = eth_type_trans(skb, dev); 604 skb->protocol = eth_type_trans(skb, dev);
605 skb->ip_summed = CHECKSUM_NONE; 605 skb_checksum_none_assert(skb);
606 606
607 /* bookkeeping */ 607 /* bookkeeping */
608 dev->stats.rx_packets++; 608 dev->stats.rx_packets++;
@@ -782,7 +782,8 @@ static int ibmlana_open(struct net_device *dev)
782 782
783 /* register resources - only necessary for IRQ */ 783 /* register resources - only necessary for IRQ */
784 784
785 result = request_irq(priv->realirq, irq_handler, IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev); 785 result = request_irq(priv->realirq, irq_handler, IRQF_SHARED,
786 dev->name, dev);
786 if (result != 0) { 787 if (result != 0) {
787 printk(KERN_ERR "%s: failed to register irq %d\n", dev->name, dev->irq); 788 printk(KERN_ERR "%s: failed to register irq %d\n", dev->name, dev->irq);
788 return result; 789 return result;