From d665edd4fcccc808cc02babbdfcc31ed47ae3a48 Mon Sep 17 00:00:00 2001 From: Yevgeny Petrilin Date: Mon, 1 Jun 2009 23:28:29 +0000 Subject: [PATCH] --- yaml --- r: 150599 b: refs/heads/master c: e486973e9c1477bf2be13c3883ada9ee87222e72 h: refs/heads/master i: 150597: ef03a525fd58e2b4018b758b979c7805e099fa2a 150595: ac35b240539b0f243dfda2f4999e50e6015d75c4 150591: 5b34939b2a88e17fe150587fb708f59cfacae8a5 v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/en_netdev.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 86a489bda0b4..559a7d4c6bdb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f813cad836ab14b764cfe76f42a3b50bb9677b30 +refs/heads/master: e486973e9c1477bf2be13c3883ada9ee87222e72 diff --git a/trunk/drivers/net/mlx4/en_netdev.c b/trunk/drivers/net/mlx4/en_netdev.c index 37e4d30cbf04..0a7e78ade63f 100644 --- a/trunk/drivers/net/mlx4/en_netdev.c +++ b/trunk/drivers/net/mlx4/en_netdev.c @@ -1038,7 +1038,9 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, * Set driver features */ dev->features |= NETIF_F_SG; + dev->vlan_features |= NETIF_F_SG; dev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; + dev->vlan_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM; dev->features |= NETIF_F_HIGHDMA; dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | @@ -1048,6 +1050,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, if (mdev->LSO_support) { dev->features |= NETIF_F_TSO; dev->features |= NETIF_F_TSO6; + dev->vlan_features |= NETIF_F_TSO; + dev->vlan_features |= NETIF_F_TSO6; } mdev->pndev[port] = dev;