diff options
| author | Brice Goglin <brice@myri.com> | 2009-05-24 05:27:59 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-25 00:35:54 -0700 |
| commit | dddc045e2fdd4eb8d7dfac29bff191d639fff8c3 (patch) | |
| tree | b4788fcccb78022fb8e7f5ca971531e24ae2f7de | |
| parent | 2552c31be3bcc7681e603cde44d97b66e4a885f0 (diff) | |
| download | blackbird-op-linux-dddc045e2fdd4eb8d7dfac29bff191d639fff8c3.tar.gz blackbird-op-linux-dddc045e2fdd4eb8d7dfac29bff191d639fff8c3.zip | |
myri10ge: Add support for vlan_features
Add support for netdev->vlan_features in the myri10ge driver.
Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 675f6771f2ea..7e28b4610122 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/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 */ |
