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
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
drivers
/
net
/
ixgb
/
ixgb_main.c
diff --git
a/drivers/net/ixgb/ixgb_main.c
b/drivers/net/ixgb/ixgb_main.c
index
cfd67d8
..
8385245
100644
(file)
--- a/
drivers/net/ixgb/ixgb_main.c
+++ b/
drivers/net/ixgb/ixgb_main.c
@@
-1168,7
+1168,7
@@
ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
uint16_t ipcse, tucse, mss;
int err;
uint16_t ipcse, tucse, mss;
int err;
- if
(likely(skb_shinfo(skb)->tso_size
)) {
+ if
(likely(skb_is_gso(skb)
)) {
if (skb_header_cloned(skb)) {
err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
if (err)
if (skb_header_cloned(skb)) {
err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
if (err)
@@
-1176,7
+1176,7
@@
ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
}
hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
}
hdr_len = ((skb->h.raw - skb->data) + (skb->h.th->doff << 2));
- mss = skb_shinfo(skb)->
t
so_size;
+ mss = skb_shinfo(skb)->
g
so_size;
skb->nh.iph->tot_len = 0;
skb->nh.iph->check = 0;
skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,
skb->nh.iph->tot_len = 0;
skb->nh.iph->check = 0;
skb->h.th->check = ~csum_tcpudp_magic(skb->nh.iph->saddr,