* [PATCH 3/3] myri10ge: Add support for vlan_features
@ 2009-05-24 15:27 Brice Goglin
2009-05-25 7:36 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Brice Goglin @ 2009-05-24 15:27 UTC (permalink / raw)
To: David S. Miller; +Cc: Linux Network Development list
Add support for netdev->vlan_features in the myri10ge driver.
Signed-off-by: Brice Goglin <brice@myri.com>
---
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 675f677..7e28b46 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 */
--
1.6.2.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 3/3] myri10ge: Add support for vlan_features
2009-05-24 15:27 [PATCH 3/3] myri10ge: Add support for vlan_features Brice Goglin
@ 2009-05-25 7:36 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-05-25 7:36 UTC (permalink / raw)
To: brice; +Cc: netdev
From: Brice Goglin <brice@myri.com>
Date: Sun, 24 May 2009 17:27:59 +0200
> Add support for netdev->vlan_features in the myri10ge driver.
>
> Signed-off-by: Brice Goglin <brice@myri.com>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-25 7:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-24 15:27 [PATCH 3/3] myri10ge: Add support for vlan_features Brice Goglin
2009-05-25 7:36 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).