On Thu, Jun 05, 2008 at 05:33:06AM -0700, Dale Farnsworth wrote:I've folded the following patch into the patch. OK? Index: linux-2.6.26-rc5/drivers/net/mv643xx_eth.c =================================================================== --- linux-2.6.26-rc5.orig/drivers/net/mv643xx_eth.c +++ linux-2.6.26-rc5/drivers/net/mv643xx_eth.c @@ -454,6 +454,11 @@ static void rxq_refill(struct rx_queue * RX_ENABLE_INTERRUPT; wmb(); + /* + * The hardware automatically prepends 2 bytes of + * dummy data to each received packet, so that the + * IP header ends up 16-byte aligned. + */ skb_reserve(skb, 2); } @@ -508,7 +513,11 @@ static int rxq_process(struct rx_queue * /* * Update statistics. - * Note byte count includes 4 byte CRC count + * + * Note that the descriptor byte count includes 2 dummy + * bytes automatically inserted by the hardware at the + * start of the packet (which we don't count), and a 4 + * byte CRC at the end of the packet (which we do count). */ stats->rx_packets++; stats->rx_bytes += rx_desc->byte_cnt - 2; @@ -999,6 +1008,7 @@ static int mv643xx_eth_nway_reset(struct static u32 mv643xx_eth_get_link(struct net_device *dev) { struct mv643xx_eth_private *mp = netdev_priv(dev); + return mii_link_ok(&mp->mii); } -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
| Joe Perches | [PATCH 143/148] include/asm-x86/vm86.h: checkpatch cleanups - formatting only |
| Linus Torvalds | Re: Back to the future. |
| Greg Kroah-Hartman | [PATCH 004/196] Chinese: add translation of SubmittingPatches |
| Trent Piepho | [PATCH] [POWERPC] Improve (in|out)_beXX() asm code |
git: | |
| David Miller | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Gerrit Renker | [PATCH 15/37] dccp: Set per-connection CCIDs via socket options |
| David Miller | [GIT]: Networking |
| Linus Torvalds | Re: iptables very slow after commit 784544739a25c30637397ace5489eeb6e15d7d49 |
