From ffaf88c113b7b4ba3bd75989ad153cbe1e920bae Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Sun, 24 May 2009 05:27:59 +0000 Subject: [PATCH] --- yaml --- r: 150369 b: refs/heads/master c: dddc045e2fdd4eb8d7dfac29bff191d639fff8c3 h: refs/heads/master i: 150367: 5146a20bc2424d77bcc600b7ad3c33fe373a73d8 v: v3 --- [refs] | 2 +- trunk/drivers/net/myri10ge/myri10ge.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1623b05af952..576aebc5d374 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2552c31be3bcc7681e603cde44d97b66e4a885f0 +refs/heads/master: dddc045e2fdd4eb8d7dfac29bff191d639fff8c3 diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c index 675f6771f2ea..7e28b4610122 100644 --- a/trunk/drivers/net/myri10ge/myri10ge.c +++ b/trunk/drivers/net/myri10ge/myri10ge.c @@ -75,7 +75,7 @@ #include "myri10ge_mcp.h" #include "myri10ge_mcp_gen_header.h" -#define MYRI10GE_VERSION_STR "1.5.0-1.415" +#define MYRI10GE_VERSION_STR "1.5.0-1.418" MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); MODULE_AUTHOR("Maintainer: help@myri.com"); @@ -3916,6 +3916,12 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->features |= NETIF_F_HIGHDMA; netdev->features |= NETIF_F_LRO; + netdev->vlan_features |= mgp->features; + if (mgp->fw_ver_tiny < 37) + netdev->vlan_features &= ~NETIF_F_TSO6; + if (mgp->fw_ver_tiny < 32) + netdev->vlan_features &= ~NETIF_F_TSO; + /* make sure we can get an irq, and that MSI can be * setup (if available). Also ensure netdev->irq * is set to correct value if MSI is enabled */