bnx2x: Update bnx2x to use new vlan accleration.

Make the bnx2x driver use the new vlan accleration model.

Signed-off-by: Hao Zheng <hzheng@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
CC: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 16 insertions, 17 deletions

diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
index 54fe0615a8b9..daefef618ef7 100644
--- a/drivers/net/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
@@ -1117,35 +1117,34 @@ static int bnx2x_set_flags(struct net_device *dev, u32 data)
         int changed = 0;
         int rc = 0;
 
-        if (data & ~(ETH_FLAG_LRO | ETH_FLAG_RXHASH))
-                return -EINVAL;
-
         if (bp->recovery_state != BNX2X_RECOVERY_DONE) {
                 printk(KERN_ERR "Handling parity error recovery. Try again later\n");
                 return -EAGAIN;
         }
 
+        if (!(data & ETH_FLAG_RXVLAN))
+                return -EOPNOTSUPP;
+
+        if ((data & ETH_FLAG_LRO) && bp->rx_csum && bp->disable_tpa)
+                return -EINVAL;
+
+        rc = ethtool_op_set_flags(dev, data, ETH_FLAG_LRO | ETH_FLAG_RXVLAN |
+                                        ETH_FLAG_TXVLAN | ETH_FLAG_RXHASH);
+        if (rc)
+                return rc;
+
         /* TPA requires Rx CSUM offloading */
         if ((data & ETH_FLAG_LRO) && bp->rx_csum) {
-                if (!bp->disable_tpa) {
-                        if (!(dev->features & NETIF_F_LRO)) {
-                                dev->features |= NETIF_F_LRO;
-                                bp->flags |= TPA_ENABLE_FLAG;
-                                changed = 1;
-                        }
-                } else
-                        rc = -EINVAL;
-        } else if (dev->features & NETIF_F_LRO) {
+                if (!(bp->flags & TPA_ENABLE_FLAG)) {
+                        bp->flags |= TPA_ENABLE_FLAG;
+                        changed = 1;
+                }
+        } else if (bp->flags & TPA_ENABLE_FLAG) {
                 dev->features &= ~NETIF_F_LRO;
                 bp->flags &= ~TPA_ENABLE_FLAG;
                 changed = 1;
         }
 
-        if (data & ETH_FLAG_RXHASH)
-                dev->features |= NETIF_F_RXHASH;
-        else
-                dev->features &= ~NETIF_F_RXHASH;
-
         if (changed && netif_running(dev)) {
                 bnx2x_nic_unload(bp, UNLOAD_NORMAL);
                 rc = bnx2x_nic_load(bp, LOAD_NORMAL);