git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream-fixes
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
bfin_mac.c
diff --git
a/drivers/net/bfin_mac.c
b/drivers/net/bfin_mac.c
index 0b99b554929545cecf0abf93812873d7306518d4..eb971755a3ff34c5b8f76d5b8b63bf5f3a83aad0 100644
(file)
--- a/
drivers/net/bfin_mac.c
+++ b/
drivers/net/bfin_mac.c
@@
-676,7
+676,7
@@
static void bf537mac_rx(struct net_device *dev)
skb->protocol = eth_type_trans(skb, dev);
#if defined(BFIN_MAC_CSUM_OFFLOAD)
skb->csum = current_rx_ptr->status.ip_payload_csum;
- skb->ip_summed = CHECKSUM_
PARTIAL
;
+ skb->ip_summed = CHECKSUM_
COMPLETE
;
#endif
netif_rx(skb);