git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[pandora-kernel.git]
/
drivers
/
net
/
tile
/
tilepro.c
diff --git
a/drivers/net/tile/tilepro.c
b/drivers/net/tile/tilepro.c
index
314f7e7
..
1e2af96
100644
(file)
--- a/
drivers/net/tile/tilepro.c
+++ b/
drivers/net/tile/tilepro.c
@@
-1928,7
+1928,7
@@
static int tile_net_tx(struct sk_buff *skb, struct net_device *dev)
unsigned int len = skb->len;
unsigned char *data = skb->data;
- unsigned int csum_start = skb
->csum_start - skb_headroom
(skb);
+ unsigned int csum_start = skb
_checksum_start_offset
(skb);
lepp_frag_t frags[LEPP_MAX_FRAGS];