From 6cd87ce2b2eabc65714cf66e9dc4e214d9956dfc Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Mon, 11 Dec 2006 11:27:19 +0100 Subject: [PATCH] --- yaml --- r: 44187 b: refs/heads/master c: 13348beee529cd1200deeac161e1b2de0705b495 h: refs/heads/master i: 44185: f9f1d63bc783ce8af6f9fab318645201d5490009 44183: a4bff5d9cd65b43d905938e5cf0e9bfac88378eb 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 82d47a2d5dfa..22fdfd5c5f30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de3c4507047f2457359551c49b093669acb4f190 +refs/heads/master: 13348beee529cd1200deeac161e1b2de0705b495 diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c index d38217a7eb11..a0d1dae39fd2 100644 --- a/trunk/drivers/net/myri10ge/myri10ge.c +++ b/trunk/drivers/net/myri10ge/myri10ge.c @@ -1696,11 +1696,11 @@ static int myri10ge_open(struct net_device *dev) * tell him the buffer is larger, because we only use 1 * buffer/pkt, and the mtu will prevent overruns. */ - big_pow2 = dev->mtu + ETH_HLEN + MXGEFW_PAD; + big_pow2 = dev->mtu + ETH_HLEN + VLAN_HLEN + MXGEFW_PAD; if (big_pow2 < MYRI10GE_ALLOC_SIZE / 2) { while ((big_pow2 & (big_pow2 - 1)) != 0) big_pow2++; - mgp->big_bytes = dev->mtu + ETH_HLEN + MXGEFW_PAD; + mgp->big_bytes = dev->mtu + ETH_HLEN + VLAN_HLEN + MXGEFW_PAD; } else { big_pow2 = MYRI10GE_ALLOC_SIZE; mgp->big_bytes = big_pow2;