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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
net
/
ns83820.c
diff --git
a/drivers/net/ns83820.c
b/drivers/net/ns83820.c
index
0ff2d42
..
c2551c5
100644
(file)
--- a/
drivers/net/ns83820.c
+++ b/
drivers/net/ns83820.c
@@
-113,6
+113,8
@@
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
+#define DRV_NAME "ns83820"
+
/* Global parameters. See MODULE_PARM near the bottom. */
static int ihr = 2;
static int reset_phy = 0;
/* Global parameters. See MODULE_PARM near the bottom. */
static int ihr = 2;
static int reset_phy = 0;
@@
-1087,7
+1089,7
@@
again:
frag = skb_shinfo(skb)->frags;
if (!nr_frags)
frag = skb_shinfo(skb)->frags;
if (!nr_frags)
- frag =
0
;
+ frag =
NULL
;
extsts = 0;
if (skb->ip_summed == CHECKSUM_HW) {
extsts |= EXTSTS_IPPKT;
extsts = 0;
if (skb->ip_summed == CHECKSUM_HW) {
extsts |= EXTSTS_IPPKT;
@@
-1851,7
+1853,7
@@
static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
0);
err = request_irq(pci_dev->irq, ns83820_irq, SA_SHIRQ,
0);
err = request_irq(pci_dev->irq, ns83820_irq, SA_SHIRQ,
-
ndev->name
, ndev);
+
DRV_NAME
, ndev);
if (err) {
printk(KERN_INFO "ns83820: unable to register irq %d\n",
pci_dev->irq);
if (err) {
printk(KERN_INFO "ns83820: unable to register irq %d\n",
pci_dev->irq);