Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dddc045e authored by Brice Goglin's avatar Brice Goglin Committed by David S. Miller
Browse files

myri10ge: Add support for vlan_features 



Add support for netdev->vlan_features in the myri10ge driver.

Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2552c31b

drivers/net/myri10ge/myri10ge.c

+7 −1
Original line number Diff line number Diff line
@@ -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 */