* [PATCH 0/1] myri10ge fix for 2.6.21
@ 2007-03-27 19:52 Brice Goglin
2007-03-27 19:54 ` [PATCH 1/1] myri10ge: correctly detect when TSO should be used Brice Goglin
2007-03-27 19:54 ` Brice Goglin
0 siblings, 2 replies; 4+ messages in thread
From: Brice Goglin @ 2007-03-27 19:52 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Hi Jeff,
Here's a last minute fix for myri10ge in 2.6.21. Please apply.
Thanks,
Brice
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] myri10ge: correctly detect when TSO should be used
2007-03-27 19:52 [PATCH 0/1] myri10ge fix for 2.6.21 Brice Goglin
@ 2007-03-27 19:54 ` Brice Goglin
2007-03-27 19:54 ` Brice Goglin
1 sibling, 0 replies; 4+ messages in thread
From: Brice Goglin @ 2007-03-27 19:54 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Correctly detect when TSO should be used on transmit by looking at the
skb->gso_size rather than seeing if the frame was larger than our MTU.
The old method causes problems when a host with a large (jumbo) MTU is
sending to a host with a small (standard) MTU.
---
drivers/net/myri10ge/myri10ge.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-26 01:34:08.000000000 +0200
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-27 21:44:27.000000000 +0200
@@ -71,7 +71,7 @@
#include "myri10ge_mcp.h"
#include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.3.0-1.226"
+#define MYRI10GE_VERSION_STR "1.3.0-1.227"
MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -2015,10 +2015,9 @@
mss = 0;
max_segments = MXGEFW_MAX_SEND_DESC;
- if (skb->len > (dev->mtu + ETH_HLEN)) {
+ if (skb_is_gso(skb)) {
mss = skb_shinfo(skb)->gso_size;
- if (mss != 0)
- max_segments = MYRI10GE_MAX_SEND_DESC_TSO;
+ max_segments = MYRI10GE_MAX_SEND_DESC_TSO;
}
if ((unlikely(avail < max_segments))) {
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/1] myri10ge: correctly detect when TSO should be used
2007-03-27 19:52 [PATCH 0/1] myri10ge fix for 2.6.21 Brice Goglin
2007-03-27 19:54 ` [PATCH 1/1] myri10ge: correctly detect when TSO should be used Brice Goglin
@ 2007-03-27 19:54 ` Brice Goglin
2007-03-28 6:19 ` Jeff Garzik
1 sibling, 1 reply; 4+ messages in thread
From: Brice Goglin @ 2007-03-27 19:54 UTC (permalink / raw)
To: Jeff Garzik; +Cc: netdev
Correctly detect when TSO should be used on transmit by looking at the
skb->gso_size rather than seeing if the frame was larger than our MTU.
The old method causes problems when a host with a large (jumbo) MTU is
sending to a host with a small (standard) MTU.
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-26 01:34:08.000000000 +0200
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-27 21:44:27.000000000 +0200
@@ -71,7 +71,7 @@
#include "myri10ge_mcp.h"
#include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.3.0-1.226"
+#define MYRI10GE_VERSION_STR "1.3.0-1.227"
MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -2015,10 +2015,9 @@
mss = 0;
max_segments = MXGEFW_MAX_SEND_DESC;
- if (skb->len > (dev->mtu + ETH_HLEN)) {
+ if (skb_is_gso(skb)) {
mss = skb_shinfo(skb)->gso_size;
- if (mss != 0)
- max_segments = MYRI10GE_MAX_SEND_DESC_TSO;
+ max_segments = MYRI10GE_MAX_SEND_DESC_TSO;
}
if ((unlikely(avail < max_segments))) {
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/1] myri10ge: correctly detect when TSO should be used
2007-03-27 19:54 ` Brice Goglin
@ 2007-03-28 6:19 ` Jeff Garzik
0 siblings, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2007-03-28 6:19 UTC (permalink / raw)
To: Brice Goglin; +Cc: netdev
Brice Goglin wrote:
> Correctly detect when TSO should be used on transmit by looking at the
> skb->gso_size rather than seeing if the frame was larger than our MTU.
> The old method causes problems when a host with a large (jumbo) MTU is
> sending to a host with a small (standard) MTU.
>
> Signed-off-by: Brice Goglin <brice@myri.com>
> ---
> drivers/net/myri10ge/myri10ge.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
applied to #upstream-fixes
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-03-28 6:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-27 19:52 [PATCH 0/1] myri10ge fix for 2.6.21 Brice Goglin
2007-03-27 19:54 ` [PATCH 1/1] myri10ge: correctly detect when TSO should be used Brice Goglin
2007-03-27 19:54 ` Brice Goglin
2007-03-28 6:19 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).