myri10ge: Add support for vlan_features
authorBrice Goglin <brice@myri.com>
Sun, 24 May 2009 05:27:59 +0000 (05:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 May 2009 07:35:54 +0000 (00:35 -0700)
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>
drivers/net/myri10ge/myri10ge.c

index 675f6771f2ea58a02bb99e371f9f0c53cc4288b1..7e28b4610122add23d2044dc8089a8679cdbb324 100644 (file)
@@ -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 */