diff options
author | Brice Goglin <brice@myri.com> | 2009-05-24 01:27:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-25 03:35:54 -0400 |
commit | dddc045e2fdd4eb8d7dfac29bff191d639fff8c3 (patch) | |
tree | b4788fcccb78022fb8e7f5ca971531e24ae2f7de | |
parent | 2552c31be3bcc7681e603cde44d97b66e4a885f0 (diff) |
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 @@ | |||
75 | #include "myri10ge_mcp.h" | 75 | #include "myri10ge_mcp.h" |
76 | #include "myri10ge_mcp_gen_header.h" | 76 | #include "myri10ge_mcp_gen_header.h" |
77 | 77 | ||
78 | #define MYRI10GE_VERSION_STR "1.5.0-1.415" | 78 | #define MYRI10GE_VERSION_STR "1.5.0-1.418" |
79 | 79 | ||
80 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); | 80 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); |
81 | MODULE_AUTHOR("Maintainer: help@myri.com"); | 81 | MODULE_AUTHOR("Maintainer: help@myri.com"); |
@@ -3916,6 +3916,12 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3916 | netdev->features |= NETIF_F_HIGHDMA; | 3916 | netdev->features |= NETIF_F_HIGHDMA; |
3917 | netdev->features |= NETIF_F_LRO; | 3917 | netdev->features |= NETIF_F_LRO; |
3918 | 3918 | ||
3919 | netdev->vlan_features |= mgp->features; | ||
3920 | if (mgp->fw_ver_tiny < 37) | ||
3921 | netdev->vlan_features &= ~NETIF_F_TSO6; | ||
3922 | if (mgp->fw_ver_tiny < 32) | ||
3923 | netdev->vlan_features &= ~NETIF_F_TSO; | ||
3924 | |||
3919 | /* make sure we can get an irq, and that MSI can be | 3925 | /* make sure we can get an irq, and that MSI can be |
3920 | * setup (if available). Also ensure netdev->irq | 3926 | * setup (if available). Also ensure netdev->irq |
3921 | * is set to correct value if MSI is enabled */ | 3927 | * is set to correct value if MSI is enabled */ |