netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Szilveszter Ordog <slipszi@gmail.com>
To: Matt Carlson <mcarlson@broadcom.com>, Michael Chan <mchan@broadcom.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH] tg3: receive packets larger than MTU but smaller than 1500 bytes
Date: Tue, 23 Feb 2010 12:56:26 +0100	[thread overview]
Message-ID: <ac67d9131002230356h7d293a5yba011698302f8c4a@mail.gmail.com> (raw)

This allows for proper ICMP needs fragmentation responses on standard Ethernet
networks.

Signed-off-by: Szilveszter Ördög <slipszi@gmail.com>
---
 drivers/net/tg3.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 46a3f86..0c5027b 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -93,6 +93,8 @@
 #define TG3_MIN_MTU			60
 #define TG3_MAX_MTU(tp)	\
 	((tp->tg3_flags2 & TG3_FLG2_JUMBO_CAPABLE) ? 9000 : 1500)
+#define TG3_MAX_RX_MTU(tp) \
+	max(tp->dev->mtu, (unsigned int)ETH_DATA_LEN)

 /* These numbers seem to be hard coded in the NIC firmware somehow.
  * You can't change the ring sizes, but you can change where you place
@@ -4532,7 +4534,7 @@ static int tg3_rx(struct tg3 *tp, int budget)

 		skb->protocol = eth_type_trans(skb, tp->dev);

-		if (len > (tp->dev->mtu + ETH_HLEN) &&
+		if (len > (TG3_MAX_RX_MTU(tp) + ETH_HLEN) &&
 		    skb->protocol != htons(ETH_P_8021Q)) {
 			dev_kfree_skb(skb);
 			goto next_pkt;
@@ -6979,7 +6981,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)

 	/* MTU + ethernet header + FCS + optional VLAN tag */
 	tw32(MAC_RX_MTU_SIZE,
-	     tp->dev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);
+	     TG3_MAX_RX_MTU(tp) + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);

 	/* The slot time is changed by tg3_setup_phy if we
 	 * run at gigabit with half duplex.
-- 
1.6.3.3

             reply	other threads:[~2010-02-23 11:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-23 11:56 Szilveszter Ordog [this message]
2010-02-23 23:15 ` [PATCH] tg3: receive packets larger than MTU but smaller than 1500 bytes Matt Carlson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ac67d9131002230356h7d293a5yba011698302f8c4a@mail.gmail.com \
    --to=slipszi@gmail.com \
    --cc=mcarlson@broadcom.com \
    --cc=mchan@broadcom.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).