From ef137094f4ceee079b07d3b4eeb67699b7dcd9ab Mon Sep 17 00:00:00 2001 From: Emil Tantilov Date: Wed, 1 Dec 2010 05:47:05 +0000 Subject: [PATCH] --- yaml --- r: 225005 b: refs/heads/master c: 5136cad37b276e3e11c4f8ad0bcf9cb2eec0e5af h: refs/heads/master i: 225003: 3219a96e1775d17441630b9fe453a999476efebc v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d40957627b87..00d92c0161c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d994653db465616a7bf27703e733170c47488cdf +refs/heads/master: 5136cad37b276e3e11c4f8ad0bcf9cb2eec0e5af diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c index 90a740d77e5d..f2245ac75034 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c @@ -2202,7 +2202,7 @@ static int ixgbe_set_flags(struct net_device *netdev, u32 data) need_reset = (data & ETH_FLAG_RXVLAN) != (netdev->features & NETIF_F_HW_VLAN_RX); - rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_LRO | + rc = ethtool_op_set_flags(netdev, data, ETH_FLAG_LRO | ETH_FLAG_NTUPLE | ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN); if (rc) return rc;