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
/
typhoon.c
diff --git
a/drivers/net/typhoon.c
b/drivers/net/typhoon.c
index
d9258d4
..
389d19f
100644
(file)
--- a/
drivers/net/typhoon.c
+++ b/
drivers/net/typhoon.c
@@
-340,7
+340,7
@@
enum state_values {
#endif
#if defined(NETIF_F_TSO)
#endif
#if defined(NETIF_F_TSO)
-#define skb_tso_size(x) (skb_shinfo(x)->
t
so_size)
+#define skb_tso_size(x) (skb_shinfo(x)->
g
so_size)
#define TSO_NUM_DESCRIPTORS 2
#define TSO_OFFLOAD_ON TYPHOON_OFFLOAD_TCP_SEGMENT
#else
#define TSO_NUM_DESCRIPTORS 2
#define TSO_OFFLOAD_ON TYPHOON_OFFLOAD_TCP_SEGMENT
#else
@@
-805,7
+805,7
@@
typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
* If problems develop with TSO, check this first.
*/
numDesc = skb_shinfo(skb)->nr_frags + 1;
* If problems develop with TSO, check this first.
*/
numDesc = skb_shinfo(skb)->nr_frags + 1;
- if
(skb_tso_size
(skb))
+ if
(skb_is_gso
(skb))
numDesc++;
/* When checking for free space in the ring, we need to also
numDesc++;
/* When checking for free space in the ring, we need to also
@@
-845,7
+845,7
@@
typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
TYPHOON_TX_PF_VLAN_TAG_SHIFT);
}
TYPHOON_TX_PF_VLAN_TAG_SHIFT);
}
- if
(skb_tso_size
(skb)) {
+ if
(skb_is_gso
(skb)) {
first_txd->processFlags |= TYPHOON_TX_PF_TCP_SEGMENT;
first_txd->numDesc++;
first_txd->processFlags |= TYPHOON_TX_PF_TCP_SEGMENT;
first_txd->numDesc++;