Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6] / drivers / net / ns83820.c

diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index a05f6cbfdc0fdf09de62bcb5b99bf83ad90b0348..b0127c71a5b6f5a3fabb1950bcf57cab459124e9 100644 (file)
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1153,7 +1153,7 @@ again:
        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;
@@ -1288,7 +1288,7 @@ static void ns83820_mib_isr(struct ns83820 *dev)
 }
 
 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);