Added support for RHEL6.4 and refreshed backports

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

diff --git a/patches/0001-BACKPORT-ib_core.patch b/patches/0001-BACKPORT-ib_core.patch
index fb4397a155ae274c82d745d198918d80d58fbeb1..0c7db911a2316f6806bcdcdf3a0a4bed34165b58 100644 (file)
--- a/patches/0001-BACKPORT-ib_core.patch
+++ b/patches/0001-BACKPORT-ib_core.patch
@@ -3,19 +3,19 @@ Subject: [PATCH] BACKPORT: ib_core
 
 Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
 ---
- drivers/infiniband/core/addr.c        | 105 ++++++++++++++++++++++++++++++++++
- drivers/infiniband/core/cm.c          |  23 ++++++++
- drivers/infiniband/core/cma.c         |  43 ++++++++++++++
- drivers/infiniband/core/fmr_pool.c    |   7 +++
- drivers/infiniband/core/netlink.c     |  20 +++++++
- drivers/infiniband/core/sa_query.c    |  15 +++++
- drivers/infiniband/core/ucm.c         |  38 ++++++++++++
- drivers/infiniband/core/ucma.c        |  76 ++++++++++++++++++++++++
- drivers/infiniband/core/umem.c        |  16 ++++++
- drivers/infiniband/core/user_mad.c    |  16 ++++++
- drivers/infiniband/core/uverbs_cmd.c  |  51 +++++++++++++++++
- drivers/infiniband/core/uverbs_main.c |  40 +++++++++++++
- 12 files changed, 450 insertions(+)
+ drivers/infiniband/core/addr.c        |  105 +++++++++++++++++++++++++++++++++
+ drivers/infiniband/core/cm.c          |   23 +++++++
+ drivers/infiniband/core/cma.c         |   43 +++++++++++++
+ drivers/infiniband/core/fmr_pool.c    |    7 ++
+ drivers/infiniband/core/netlink.c     |   20 ++++++
+ drivers/infiniband/core/sa_query.c    |   15 +++++
+ drivers/infiniband/core/ucm.c         |   38 ++++++++++++
+ drivers/infiniband/core/ucma.c        |   76 ++++++++++++++++++++++++
+ drivers/infiniband/core/umem.c        |   16 +++++
+ drivers/infiniband/core/user_mad.c    |   16 +++++
+ drivers/infiniband/core/uverbs_cmd.c  |   51 ++++++++++++++++
+ drivers/infiniband/core/uverbs_main.c |   40 +++++++++++++
+ 12 files changed, 450 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
 index xxxxxxx..xxxxxxx xxxxxx

diff --git a/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch b/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch
index 7cd7d02555592f0f4bccaad4267487a980f36adb..6c640a837d2056c2aadeb6d94e59d626bd2d2e39 100644 (file)
--- a/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch
+++ b/patches/0002-BACKPORT-mlx4-mlx4_core-mlx4_en-and-mlx4_ib.patch
@@ -3,20 +3,20 @@ Subject: [PATCH] BACKPORT: mlx4 (mlx4_core, mlx4_en and mlx4_ib)
 
 Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
 ---
- drivers/infiniband/hw/mlx4/cm.c                 |  31 +++++
- drivers/infiniband/hw/mlx4/main.c               |  16 +++
- drivers/net/ethernet/mellanox/mlx4/cmd.c        |   6 +
- drivers/net/ethernet/mellanox/mlx4/en_cq.c      |  10 ++
- drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c  |  12 ++
- drivers/net/ethernet/mellanox/mlx4/en_ethtool.c |  51 +++++++
- drivers/net/ethernet/mellanox/mlx4/en_netdev.c  | 176 +++++++++++++++++++++++-
- drivers/net/ethernet/mellanox/mlx4/en_rx.c      |  29 ++++
- drivers/net/ethernet/mellanox/mlx4/en_tx.c      |  36 +++++
- drivers/net/ethernet/mellanox/mlx4/eq.c         |   8 ++
- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h    |  57 ++++++++
- include/linux/mlx4/cmd.h                        |   2 +
- include/linux/mlx4/device.h                     |   6 +
- 13 files changed, 439 insertions(+), 1 deletion(-)
+ drivers/infiniband/hw/mlx4/cm.c                 |   31 ++++
+ drivers/infiniband/hw/mlx4/main.c               |   16 ++
+ drivers/net/ethernet/mellanox/mlx4/cmd.c        |    6 +
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c      |   10 ++
+ drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c  |   12 ++
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c |   51 +++++++
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c  |  176 ++++++++++++++++++++++-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c      |   29 ++++
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c      |   36 +++++
+ drivers/net/ethernet/mellanox/mlx4/eq.c         |    8 +
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h    |   57 ++++++++
+ include/linux/mlx4/cmd.h                        |    2 +
+ include/linux/mlx4/device.h                     |    6 +
+ 13 files changed, 439 insertions(+), 1 deletions(-)
 
 diff --git a/drivers/infiniband/hw/mlx4/cm.c b/drivers/infiniband/hw/mlx4/cm.c
 index xxxxxxx..xxxxxxx xxxxxx

diff --git a/patches/0003-BACKPORT-ib_ipoib.patch b/patches/0003-BACKPORT-ib_ipoib.patch
index a3e7c535aead9f07ab5cfe40a7230418651f04c2..50bdd014b9da72d8e29f89d4450bc1e60e3152c3 100644 (file)
--- a/patches/0003-BACKPORT-ib_ipoib.patch
+++ b/patches/0003-BACKPORT-ib_ipoib.patch
@@ -3,12 +3,12 @@ Subject: [PATCH] BACKPORT: ib_ipoib
 
 Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
 ---
- drivers/infiniband/ulp/ipoib/ipoib.h           |  3 +++
- drivers/infiniband/ulp/ipoib/ipoib_cm.c        |  8 ++++++
- drivers/infiniband/ulp/ipoib/ipoib_main.c      | 35 ++++++++++++++++++++++++++
- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +++++++++++
- drivers/infiniband/ulp/ipoib/ipoib_netlink.c   |  8 ++++++
- 5 files changed, 69 insertions(+)
+ drivers/infiniband/ulp/ipoib/ipoib.h           |    3 ++
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c        |    8 +++++
+ drivers/infiniband/ulp/ipoib/ipoib_main.c      |   37 ++++++++++++++++++++++++
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c |   15 +++++++++
+ drivers/infiniband/ulp/ipoib/ipoib_netlink.c   |    8 +++++
+ 5 files changed, 71 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
 index xxxxxxx..xxxxxxx xxxxxx
@@ -104,19 +104,27 @@ index xxxxxxx..xxxxxxx xxxxxx
                dev_set_mtu(dev, min(priv->mcast_mtu, dev->mtu));
                rtnl_unlock();
                ipoib_flush_paths(dev);
-@@ -1313,7 +1331,11 @@ void ipoib_dev_cleanup(struct net_device *dev)
-               cancel_delayed_work(&cpriv->neigh_reap_task);
+@@ -1307,6 +1325,7 @@ void ipoib_dev_cleanup(struct net_device *dev)
+       ipoib_delete_debug_files(dev);
+ 
+       /* Delete any child interfaces first */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
+       list_for_each_entry_safe(cpriv, tcpriv, &priv->child_intfs, list) {
+               /* Stop GC on child */
+               set_bit(IPOIB_STOP_NEIGH_GC, &cpriv->flags);
+@@ -1314,6 +1333,11 @@ void ipoib_dev_cleanup(struct net_device *dev)
                unregister_netdevice_queue(cpriv->dev, &head);
        }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
        unregister_netdevice_many(&head);
 +#else
-+      unregister_netdevice(cpriv->dev);
++        list_for_each_entry_safe(cpriv, tcpriv,
++                               &priv->child_intfs, list)
++              unregister_netdevice(cpriv->dev);
 +#endif
  
        ipoib_ib_dev_cleanup(dev);
  
-@@ -1335,7 +1357,9 @@ static const struct net_device_ops ipoib_netdev_ops = {
+@@ -1335,7 +1359,9 @@ static const struct net_device_ops ipoib_netdev_ops = {
        .ndo_open                = ipoib_open,
        .ndo_stop                = ipoib_stop,
        .ndo_change_mtu          = ipoib_change_mtu,
@@ -126,7 +134,7 @@ index xxxxxxx..xxxxxxx xxxxxx
        .ndo_start_xmit          = ipoib_start_xmit,
        .ndo_tx_timeout          = ipoib_timeout,
        .ndo_set_rx_mode         = ipoib_set_mcast_list,
-@@ -1522,6 +1546,7 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
+@@ -1522,6 +1548,7 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
        kfree(device_attr);
  
        if (priv->hca_caps & IB_DEVICE_UD_IP_CSUM) {
@@ -134,7 +142,7 @@ index xxxxxxx..xxxxxxx xxxxxx
                priv->dev->hw_features = NETIF_F_SG |
                        NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
  
-@@ -1529,6 +1554,14 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
+@@ -1529,6 +1556,14 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
                        priv->dev->hw_features |= NETIF_F_TSO;
  
                priv->dev->features |= priv->dev->hw_features;
@@ -149,7 +157,7 @@ index xxxxxxx..xxxxxxx xxxxxx
        }
  
        return 0;
-@@ -1560,7 +1593,9 @@ static struct net_device *ipoib_add_port(const char *format,
+@@ -1560,7 +1595,9 @@ static struct net_device *ipoib_add_port(const char *format,
        priv->dev->mtu  = IPOIB_UD_MTU(priv->max_ib_mtu);
        priv->mcast_mtu  = priv->admin_mtu = priv->dev->mtu;
  

diff --git a/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch b/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch
index b7b032dbedff09189e4bf5c60d4a42c2504045e6..92837f99420e8d9351341e8aa930eebfbce2e8ef 100644 (file)
--- a/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch
+++ b/patches/0004-iw_cxgb3-iw_cxgb4-Enable-header-file-inclusion-with-.patch
@@ -1,6 +1,5 @@
 From: Vipul Pandya <vipul@chelsio.com>
-Subject: [PATCH] iw_cxgb3/iw_cxgb4: Enable header file inclusion with
- absolute path
+Subject: [PATCH] iw_cxgb3/iw_cxgb4: Enable header file inclusion with absolute path
 
 iw_cxgb3/iw_cxgb4 driver includes header files of cxgb3/cxgb4 drivers
 respectively. OFED build environment is not able to find the header files
@@ -8,8 +7,8 @@ if absolute path is not given.
 
 Signed-off-by: Vipul Pandya <vipul@chelsio.com>
 ---
- drivers/infiniband/hw/cxgb3/Makefile | 2 +-
- drivers/infiniband/hw/cxgb4/Makefile | 2 +-
+ drivers/infiniband/hw/cxgb3/Makefile |    2 +-
+ drivers/infiniband/hw/cxgb4/Makefile |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile