From: jacliburn@bellsouth.net
To: jeff@garzik.org
Cc: csnook@redhat.com, linux-kernel@vger.kernel.org,
atl1-devel@lists.sourceforge.net,
Jay Cliburn <jacliburn@bellsouth.net>
Subject: [PATCH 07/26] atl1: clarify max rx frame size
Date: Mon, 31 Dec 2007 19:59:45 -0600 [thread overview]
Message-ID: <1199152804-3889-8-git-send-email-jacliburn@bellsouth.net> (raw)
In-Reply-To: <1199152804-3889-1-git-send-email-jacliburn@bellsouth.net>
From: Jay Cliburn <jacliburn@bellsouth.net>
When we initially set max rx frame size, we don't explicitly allow room for
the VLAN header; it's done later in a somewhat obscure fashion. Let's make
it clear from the top that we've allowed enough room for the VLAN header.
Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
---
drivers/net/atlx/atl1.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 695dcbc..c93cf19 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -113,7 +113,7 @@ static int __devinit atl1_sw_init(struct atl1_adapter *adapter)
struct atl1_hw *hw = &adapter->hw;
struct net_device *netdev = adapter->netdev;
- hw->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;
+ hw->max_frame_size = netdev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;
hw->min_frame_size = ETH_ZLEN + ETH_FCS_LEN;
adapter->wol = 0;
@@ -744,8 +744,8 @@ static u32 atl1_configure(struct atl1_adapter *adapter)
/* set Interrupt Clear Timer */
iowrite16(adapter->ict, hw->hw_addr + REG_CMBDISDMA_TIMER);
- /* set MTU, 4 : VLAN */
- iowrite32(hw->max_frame_size + 4, hw->hw_addr + REG_MTU);
+ /* set MTU size */
+ iowrite32(hw->max_frame_size, hw->hw_addr + REG_MTU);
/* jumbo size & rrd retirement timer */
value = (((u32) hw->rx_jumbo_th & RXQ_JMBOSZ_TH_MASK)
--
1.5.3.3
next prev parent reply other threads:[~2008-01-01 2:08 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-01 1:59 [PATCH 00/26] atl1: divide and modernize jacliburn
2008-01-01 1:59 ` [PATCH 01/26] atl1: relocate atl1 driver to /drivers/net/atlx jacliburn
2008-01-01 1:59 ` [PATCH 02/26] atl1: move common functions to atlx files jacliburn
2008-01-01 1:59 ` [PATCH 03/26] atl1: fix broken TSO jacliburn
2008-01-01 1:59 ` [PATCH 04/26] atl1: add ethtool register dump jacliburn
2008-01-22 9:54 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 05/26] atl1: print debug info if rrd error jacliburn
2008-01-22 9:55 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 06/26] atl1: update initialization parameters jacliburn
2008-01-22 9:56 ` Jeff Garzik
2008-01-23 2:13 ` Jay Cliburn
2008-01-23 2:19 ` Jeff Garzik
2008-01-23 2:30 ` Chris Snook
2008-01-01 1:59 ` jacliburn [this message]
2008-01-01 1:59 ` [PATCH 08/26] atl1: additional DMA engine configuration jacliburn
2008-01-01 1:59 ` [PATCH 09/26] atl1: refactor tx processing jacliburn
2008-01-22 9:58 ` Jeff Garzik
2008-01-23 0:31 ` Jay Cliburn
2008-01-25 1:00 ` Jay Cliburn
2008-01-25 1:08 ` Chris Snook
2008-01-25 3:01 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 10/26] atl1: use csum_start jacliburn
2008-01-01 1:59 ` [PATCH 11/26] atl1: refactor initialization and startup jacliburn
2008-01-01 1:59 ` [PATCH 12/26] atl1: refactor atl1_probe jacliburn
2008-01-01 1:59 ` [PATCH 13/26] atl1: refactor interrupt handling jacliburn
2008-01-22 9:59 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 14/26] atl1: move stray defines to header file jacliburn
2008-01-01 1:59 ` [PATCH 15/26] atl1: tidy up ring management jacliburn
2008-01-01 1:59 ` [PATCH 16/26] atl1: modernize check link function jacliburn
2008-01-01 1:59 ` [PATCH 17/26] atl1: update phy config function jacliburn
2008-01-01 1:59 ` [PATCH 18/26] atl1: make function static jacliburn
2008-01-01 1:59 ` [PATCH 19/26] atl1: modernize down/up functions jacliburn
2008-01-22 10:01 ` Jeff Garzik
2008-01-01 1:59 ` [PATCH 20/26] atl1: update change mtu jacliburn
2008-01-01 1:59 ` [PATCH 21/26] atl1: update atl1_close jacliburn
2008-01-01 2:00 ` [PATCH 22/26] atl1: update netpoll jacliburn
2008-01-01 2:00 ` [PATCH 23/26] atl1: update shutdown and remove functions jacliburn
2008-01-01 2:00 ` [PATCH 24/26] atl1: update wake-on-lan jacliburn
2008-01-01 2:00 ` [PATCH 25/26] atl1: add NAPI support jacliburn
2008-01-01 6:09 ` Joonwoo Park
2008-01-01 18:15 ` [PATCH 25/26] [REVISED] " Jay Cliburn
2008-01-02 2:56 ` Joonwoo Park
2008-01-02 3:07 ` David Miller
2008-01-01 2:00 ` [PATCH 26/26] atl1: remove experimental tag and clean up comments jacliburn
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=1199152804-3889-8-git-send-email-jacliburn@bellsouth.net \
--to=jacliburn@bellsouth.net \
--cc=atl1-devel@lists.sourceforge.net \
--cc=csnook@redhat.com \
--cc=jeff@garzik.org \
--cc=linux-kernel@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).