From f8c00f9d13e0ba3220a205a385adc3408bfaee42 Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Mon, 11 Dec 2006 11:26:38 +0100 Subject: [PATCH] --- yaml --- r: 44186 b: refs/heads/master c: de3c4507047f2457359551c49b093669acb4f190 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/myri10ge/myri10ge.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9211964d5ed4..82d47a2d5dfa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52ea6fb39b6fd08ec8718b92cddb3fed2165a921 +refs/heads/master: de3c4507047f2457359551c49b093669acb4f190 diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c index 711a8bf08fac..d38217a7eb11 100644 --- a/trunk/drivers/net/myri10ge/myri10ge.c +++ b/trunk/drivers/net/myri10ge/myri10ge.c @@ -1650,8 +1650,8 @@ static int myri10ge_open(struct net_device *dev) ? (128 - MXGEFW_PAD) : (SMP_CACHE_BYTES - MXGEFW_PAD); else - /* enough for an ETH_DATA_LEN frame */ - mgp->small_bytes = ETH_FRAME_LEN; + /* enough for a vlan encapsulated ETH_DATA_LEN frame */ + mgp->small_bytes = VLAN_ETH_FRAME_LEN; /* Override the small buffer size? */ if (myri10ge_small_bytes > 0)