projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fixed a number of bugs in the PHY Layer
[powerpc.git]
/
drivers
/
net
/
sungem.c
diff --git
a/drivers/net/sungem.c
b/drivers/net/sungem.c
index
e567d0a
..
253e96e
100644
(file)
--- a/
drivers/net/sungem.c
+++ b/
drivers/net/sungem.c
@@
-855,7
+855,7
@@
static int gem_rx(struct gem *gp, int work_to_do)
}
skb->csum = ntohs((status & RXDCTRL_TCPCSUM) ^ 0xffff);
}
skb->csum = ntohs((status & RXDCTRL_TCPCSUM) ^ 0xffff);
- skb->ip_summed = CHECKSUM_
HW
;
+ skb->ip_summed = CHECKSUM_
COMPLETE
;
skb->protocol = eth_type_trans(skb, gp->dev);
netif_receive_skb(skb);
skb->protocol = eth_type_trans(skb, gp->dev);
netif_receive_skb(skb);
@@
-932,7
+932,7
@@
static int gem_poll(struct net_device *dev, int *budget)
return 0;
}
return 0;
}
-static irqreturn_t gem_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t gem_interrupt(int irq, void *dev_id)
{
struct net_device *dev = dev_id;
struct gem *gp = dev->priv;
{
struct net_device *dev = dev_id;
struct gem *gp = dev->priv;
@@
-975,7
+975,7
@@
static void gem_poll_controller(struct net_device *dev)
/* gem_interrupt is safe to reentrance so no need
* to disable_irq here.
*/
/* gem_interrupt is safe to reentrance so no need
* to disable_irq here.
*/
- gem_interrupt(dev->irq, dev
, NULL
);
+ gem_interrupt(dev->irq, dev);
}
#endif
}
#endif
@@
-1026,7
+1026,7
@@
static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev)
unsigned long flags;
ctrl = 0;
unsigned long flags;
ctrl = 0;
- if (skb->ip_summed == CHECKSUM_
HW
) {
+ if (skb->ip_summed == CHECKSUM_
PARTIAL
) {
u64 csum_start_off, csum_stuff_off;
csum_start_off = (u64) (skb->h.raw - skb->data);
u64 csum_start_off, csum_stuff_off;
csum_start_off = (u64) (skb->h.raw - skb->data);
@@
-2896,7
+2896,7
@@
static int __devinit gem_get_device_address(struct gem *gp)
if (use_idprom)
memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
#elif defined(CONFIG_PPC_PMAC)
if (use_idprom)
memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
#elif defined(CONFIG_PPC_PMAC)
- unsigned char *addr;
+
const
unsigned char *addr;
addr = get_property(gp->of_node, "local-mac-address", NULL);
if (addr == NULL) {
addr = get_property(gp->of_node, "local-mac-address", NULL);
if (addr == NULL) {