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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
sunhme.c
diff --git
a/drivers/net/sunhme.c
b/drivers/net/sunhme.c
index
3bbf0c8
..
ef67173
100644
(file)
--- a/
drivers/net/sunhme.c
+++ b/
drivers/net/sunhme.c
@@
-32,6
+32,7
@@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
+#include <linux/mm.h>
#include <linux/bitops.h>
#include <asm/system.h>
#include <linux/bitops.h>
#include <asm/system.h>
@@
-505,7
+506,7
@@
static void happy_meal_tcvr_write(struct happy_meal *hp,
unsigned short value)
{
int tries = TCVR_WRITE_TRIES;
unsigned short value)
{
int tries = TCVR_WRITE_TRIES;
-
+
ASD(("happy_meal_tcvr_write: reg=0x%02x value=%04x\n", reg, value));
/* Welcome to Sun Microsystems, can I take your order please? */
ASD(("happy_meal_tcvr_write: reg=0x%02x value=%04x\n", reg, value));
/* Welcome to Sun Microsystems, can I take your order please? */
@@
-1207,7
+1208,7
@@
static void happy_meal_transceiver_check(struct happy_meal *hp, void __iomem *tr
* flags, thus:
*
* skb->csum = rxd->rx_flags & 0xffff;
* flags, thus:
*
* skb->csum = rxd->rx_flags & 0xffff;
- * skb->ip_summed = CHECKSUM_
HW
;
+ * skb->ip_summed = CHECKSUM_
COMPLETE
;
*
* before sending off the skb to the protocols, and we are good as gold.
*/
*
* before sending off the skb to the protocols, and we are good as gold.
*/
@@
-1778,7
+1779,7
@@
static void happy_meal_set_initial_advertisement(struct happy_meal *hp)
static int happy_meal_is_not_so_happy(struct happy_meal *hp, u32 status)
{
int reset = 0;
static int happy_meal_is_not_so_happy(struct happy_meal *hp, u32 status)
{
int reset = 0;
-
+
/* Only print messages for non-counter related interrupts. */
if (status & (GREG_STAT_STSTERR | GREG_STAT_TFIFO_UND |
GREG_STAT_MAXPKTERR | GREG_STAT_RXERR |
/* Only print messages for non-counter related interrupts. */
if (status & (GREG_STAT_STSTERR | GREG_STAT_TFIFO_UND |
GREG_STAT_MAXPKTERR | GREG_STAT_RXERR |
@@
-2074,7
+2075,7
@@
static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
/* This card is _fucking_ hot... */
skb->csum = ntohs(csum ^ 0xffff);
/* This card is _fucking_ hot... */
skb->csum = ntohs(csum ^ 0xffff);
- skb->ip_summed = CHECKSUM_
HW
;
+ skb->ip_summed = CHECKSUM_
COMPLETE
;
RXD(("len=%d csum=%4x]", len, csum));
skb->protocol = eth_type_trans(skb, dev);
RXD(("len=%d csum=%4x]", len, csum));
skb->protocol = eth_type_trans(skb, dev);
@@
-2093,10
+2094,10
@@
static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
RXD((">"));
}
RXD((">"));
}
-static irqreturn_t happy_meal_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t happy_meal_interrupt(int irq, void *dev_id)
{
{
- struct net_device *dev =
(struct net_device *)
dev_id;
- struct happy_meal *hp =
dev->priv
;
+ struct net_device *dev = dev_id;
+ struct happy_meal *hp =
netdev_priv(dev)
;
u32 happy_status = hme_read32(hp, hp->gregs + GREG_STAT);
HMD(("happy_meal_interrupt: status=%08x ", happy_status));
u32 happy_status = hme_read32(hp, hp->gregs + GREG_STAT);
HMD(("happy_meal_interrupt: status=%08x ", happy_status));
@@
-2132,7
+2133,7
@@
out:
}
#ifdef CONFIG_SBUS
}
#ifdef CONFIG_SBUS
-static irqreturn_t quattro_sbus_interrupt(int irq, void *cookie
, struct pt_regs *ptregs
)
+static irqreturn_t quattro_sbus_interrupt(int irq, void *cookie)
{
struct quattro *qp = (struct quattro *) cookie;
int i;
{
struct quattro *qp = (struct quattro *) cookie;
int i;
@@
-2268,11
+2269,11
@@
static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)
u32 tx_flags;
tx_flags = TXFLAG_OWN;
u32 tx_flags;
tx_flags = TXFLAG_OWN;
- if (skb->ip_summed == CHECKSUM_
HW
) {
+ if (skb->ip_summed == CHECKSUM_
PARTIAL
) {
u32 csum_start_off, csum_stuff_off;
csum_start_off = (u32) (skb->h.raw - skb->data);
u32 csum_start_off, csum_stuff_off;
csum_start_off = (u32) (skb->h.raw - skb->data);
- csum_stuff_off =
(u32) ((skb->h.raw + skb->csum) - skb->data)
;
+ csum_stuff_off =
csum_start_off + skb->csum_offset
;
tx_flags = (TXFLAG_OWN | TXFLAG_CSENABLE |
((csum_start_off << 14) & TXFLAG_CSBUFBEGIN) |
tx_flags = (TXFLAG_OWN | TXFLAG_CSENABLE |
((csum_start_off << 14) & TXFLAG_CSBUFBEGIN) |
@@
-2512,7
+2513,7
@@
static u32 hme_get_link(struct net_device *dev)
return (hp->sw_bmsr & BMSR_LSTATUS);
}
return (hp->sw_bmsr & BMSR_LSTATUS);
}
-static struct ethtool_ops hme_ethtool_ops = {
+static
const
struct ethtool_ops hme_ethtool_ops = {
.get_settings = hme_get_settings,
.set_settings = hme_set_settings,
.get_drvinfo = hme_get_drvinfo,
.get_settings = hme_get_settings,
.set_settings = hme_set_settings,
.get_drvinfo = hme_get_drvinfo,
@@
-3002,7
+3003,7
@@
static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n");
return -ENODEV;
}
printk(KERN_ERR "happymeal(PCI): Some PCI device info missing\n");
return -ENODEV;
}
-
+
strcpy(prom_name, pcp->prom_node->name);
#else
if (is_quattro_p(pdev))
strcpy(prom_name, pcp->prom_node->name);
#else
if (is_quattro_p(pdev))
@@
-3051,7
+3052,7
@@
static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
hp->qfe_parent = qp;
hp->qfe_ent = qfe_slot;
qp->happy_meals[qfe_slot] = dev;
hp->qfe_parent = qp;
hp->qfe_ent = qfe_slot;
qp->happy_meals[qfe_slot] = dev;
- }
+ }
hpreg_res = pci_resource_start(pdev, 0);
err = -ENODEV;
hpreg_res = pci_resource_start(pdev, 0);
err = -ENODEV;
@@
-3095,7
+3096,7
@@
static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
get_hme_mac_nonsparc(pdev, &dev->dev_addr[0]);
#endif
}
get_hme_mac_nonsparc(pdev, &dev->dev_addr[0]);
#endif
}
-
+
/* Layout registers. */
hp->gregs = (hpreg_base + 0x0000UL);
hp->etxregs = (hpreg_base + 0x2000UL);
/* Layout registers. */
hp->gregs = (hpreg_base + 0x0000UL);
hp->etxregs = (hpreg_base + 0x2000UL);
@@
-3206,7
+3207,7
@@
static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
qpdev->device == PCI_DEVICE_ID_DEC_21153)
printk("DEC 21153 PCI Bridge\n");
else
qpdev->device == PCI_DEVICE_ID_DEC_21153)
printk("DEC 21153 PCI Bridge\n");
else
- printk("unknown bridge %04x.%04x\n",
+ printk("unknown bridge %04x.%04x\n",
qpdev->vendor, qpdev->device);
}
qpdev->vendor, qpdev->device);
}