Fixed mlx4 backport

Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>

diff --git a/patches/0003-BACKPORT-mlx4.patch b/patches/0003-BACKPORT-mlx4.patch
index d31e4541a1f68443a703b5c98ddcc310dec3eb74..0e58a2873b3a3da9d52f798561688568ed89b4ad 100644 (file)
--- a/patches/0003-BACKPORT-mlx4.patch
+++ b/patches/0003-BACKPORT-mlx4.patch
@@ -3,21 +3,21 @@ Subject: [PATCH] BACKPORT: mlx4
 
 Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
 ---
- drivers/infiniband/hw/mlx4/cm.c                 |  27 ++++
- drivers/infiniband/hw/mlx4/main.c               |   8 +
- drivers/net/ethernet/mellanox/mlx4/cmd.c        |   6 +
- drivers/net/ethernet/mellanox/mlx4/en_clock.c   |   2 +
- drivers/net/ethernet/mellanox/mlx4/en_cq.c      |  11 ++
- drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c  |   4 +
- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c |  62 ++++++-
- drivers/net/ethernet/mellanox/mlx4/en_netdev.c  | 205 ++++++++++++++++++++++++
- drivers/net/ethernet/mellanox/mlx4/en_rx.c      |  84 +++++++++-
- drivers/net/ethernet/mellanox/mlx4/en_tx.c      |  53 +++++-
- drivers/net/ethernet/mellanox/mlx4/eq.c         |  10 ++
- drivers/net/ethernet/mellanox/mlx4/main.c       |  24 +++
- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h    |  21 ++-
- include/linux/mlx4/cq.h                         |   5 +
- 14 files changed, 517 insertions(+), 5 deletions(-)
+ drivers/infiniband/hw/mlx4/cm.c                 |   27 +++
+ drivers/infiniband/hw/mlx4/main.c               |    8 +
+ drivers/net/ethernet/mellanox/mlx4/cmd.c        |    6 +
+ drivers/net/ethernet/mellanox/mlx4/en_clock.c   |    2 +
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c      |   11 ++
+ drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c  |    4 +
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c |   62 +++++++-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c  |  204 +++++++++++++++++++++++
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c      |   84 +++++++++-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c      |   53 ++++++-
+ drivers/net/ethernet/mellanox/mlx4/eq.c         |   10 +
+ drivers/net/ethernet/mellanox/mlx4/main.c       |   24 +++
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h    |   21 +++-
+ include/linux/mlx4/cq.h                         |    5 +
+ 14 files changed, 516 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
 index xxxxxxx..xxxxxxx xxxxxx
@@ -948,7 +948,7 @@ index xxxxxxx..xxxxxxx xxxxxx
        dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
        if (mdev->LSO_support)
                dev->hw_features |= NETIF_F_TSO | NETIF_F_TSO6;
-@@ -2588,9 +2765,37 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
+@@ -2588,9 +2765,36 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
        if (mdev->dev->caps.steering_mode ==
            MLX4_STEERING_MODE_DEVICE_MANAGED)
                dev->hw_features |= NETIF_F_NTUPLE;
@@ -968,7 +968,6 @@ index xxxxxxx..xxxxxxx xxxxxx
 +      dev->features = dev->features | NETIF_F_HIGHDMA |
 +                      NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
 +                      NETIF_F_HW_VLAN_CTAG_FILTER;
-+      dev->features |= NETIF_F_LOOPBACK;
 +
 +      if (mdev->dev->caps.steering_mode ==
 +          MLX4_STEERING_MODE_DEVICE_MANAGED)