projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pasemi: hardware rng driver
[powerpc.git]
/
drivers
/
net
/
spider_net.c
diff --git
a/drivers/net/spider_net.c
b/drivers/net/spider_net.c
index
3b91af8
..
c15e972
100644
(file)
--- a/
drivers/net/spider_net.c
+++ b/
drivers/net/spider_net.c
@@
-719,8
+719,8
@@
spider_net_prepare_tx_descr(struct spider_net_card *card,
SPIDER_NET_DESCR_CARDOWNED | SPIDER_NET_DMAC_NOCS;
spin_unlock_irqrestore(&chain->lock, flags);
SPIDER_NET_DESCR_CARDOWNED | SPIDER_NET_DMAC_NOCS;
spin_unlock_irqrestore(&chain->lock, flags);
- if (skb->protocol == htons(ETH_P_IP))
- switch (
skb->nh.iph
->protocol) {
+ if (skb->protocol == htons(ETH_P_IP)
&& skb->ip_summed == CHECKSUM_PARTIAL
)
+ switch (
ip_hdr(skb)
->protocol) {
case IPPROTO_TCP:
hwdescr->dmac_cmd_status |= SPIDER_NET_DMAC_TCP;
break;
case IPPROTO_TCP:
hwdescr->dmac_cmd_status |= SPIDER_NET_DMAC_TCP;
break;
@@
-990,7
+990,6
@@
spider_net_pass_skb_up(struct spider_net_descr *descr,
netdev = card->netdev;
skb = descr->skb;
netdev = card->netdev;
skb = descr->skb;
- skb->dev = netdev;
skb_put(skb, hwdescr->valid_size);
/* the card seems to add 2 bytes of junk in front
skb_put(skb, hwdescr->valid_size);
/* the card seems to add 2 bytes of junk in front
@@
-1831,7
+1830,7
@@
try_host_fw:
if (!dn)
goto out_err;
if (!dn)
goto out_err;
- fw_prop = get_property(dn, "firmware", &fw_size);
+ fw_prop =
of_
get_property(dn, "firmware", &fw_size);
if (!fw_prop)
goto out_err;
if (!fw_prop)
goto out_err;
@@
-2237,7
+2236,7
@@
spider_net_setup_netdev(struct spider_net_card *card)
if (!dn)
return -EIO;
if (!dn)
return -EIO;
- mac = get_property(dn, "local-mac-address", NULL);
+ mac =
of_
get_property(dn, "local-mac-address", NULL);
if (!mac)
return -EIO;
memcpy(addr.sa_data, mac, ETH_ALEN);
if (!mac)
return -EIO;
memcpy(addr.sa_data, mac, ETH_ALEN);