git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WorkStruct: make allyesconfig
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ns83820.c
diff --git
a/drivers/net/ns83820.c
b/drivers/net/ns83820.c
index
a05f6cb
..
312e0e3
100644
(file)
--- a/
drivers/net/ns83820.c
+++ b/
drivers/net/ns83820.c
@@
-427,6
+427,7
@@
struct ns83820 {
u8 __iomem *base;
struct pci_dev *pci_dev;
u8 __iomem *base;
struct pci_dev *pci_dev;
+ struct net_device *ndev;
#ifdef NS83820_VLAN_ACCEL_SUPPORT
struct vlan_group *vlgrp;
#ifdef NS83820_VLAN_ACCEL_SUPPORT
struct vlan_group *vlgrp;
@@
-631,10
+632,10
@@
static void fastcall rx_refill_atomic(struct net_device *ndev)
}
/* REFILL */
}
/* REFILL */
-static inline void queue_refill(
void *_dev
)
+static inline void queue_refill(
struct work_struct *work
)
{
{
- struct n
et_device *ndev = _dev
;
- struct n
s83820 *dev = PRIV(ndev)
;
+ struct n
s83820 *dev = container_of(work, struct ns83820, tq_refill)
;
+ struct n
et_device *ndev = dev->ndev
;
rx_refill(ndev, GFP_KERNEL);
if (dev->rx_info.up)
rx_refill(ndev, GFP_KERNEL);
if (dev->rx_info.up)
@@
-1153,7
+1154,7
@@
again:
if (!nr_frags)
frag = NULL;
extsts = 0;
if (!nr_frags)
frag = NULL;
extsts = 0;
- if (skb->ip_summed == CHECKSUM_
HW
) {
+ if (skb->ip_summed == CHECKSUM_
PARTIAL
) {
extsts |= EXTSTS_IPPKT;
if (IPPROTO_TCP == skb->nh.iph->protocol)
extsts |= EXTSTS_TCPPKT;
extsts |= EXTSTS_IPPKT;
if (IPPROTO_TCP == skb->nh.iph->protocol)
extsts |= EXTSTS_TCPPKT;
@@
-1288,7
+1289,7
@@
static void ns83820_mib_isr(struct ns83820 *dev)
}
static void ns83820_do_isr(struct net_device *ndev, u32 isr);
}
static void ns83820_do_isr(struct net_device *ndev, u32 isr);
-static irqreturn_t ns83820_irq(int foo, void *data
, struct pt_regs *regs
)
+static irqreturn_t ns83820_irq(int foo, void *data)
{
struct net_device *ndev = data;
struct ns83820 *dev = PRIV(ndev);
{
struct net_device *ndev = data;
struct ns83820 *dev = PRIV(ndev);
@@
-1841,6
+1842,7
@@
static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
ndev = alloc_etherdev(sizeof(struct ns83820));
dev = PRIV(ndev);
ndev = alloc_etherdev(sizeof(struct ns83820));
dev = PRIV(ndev);
+ dev->ndev = ndev;
err = -ENOMEM;
if (!dev)
goto out;
err = -ENOMEM;
if (!dev)
goto out;
@@
-1853,7
+1855,7
@@
static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
SET_MODULE_OWNER(ndev);
SET_NETDEV_DEV(ndev, &pci_dev->dev);
SET_MODULE_OWNER(ndev);
SET_NETDEV_DEV(ndev, &pci_dev->dev);
- INIT_WORK(&dev->tq_refill, queue_refill
, ndev
);
+ INIT_WORK(&dev->tq_refill, queue_refill);
tasklet_init(&dev->rx_tasklet, rx_action, (unsigned long)ndev);
err = pci_enable_device(pci_dev);
tasklet_init(&dev->rx_tasklet, rx_action, (unsigned long)ndev);
err = pci_enable_device(pci_dev);