-From b109b6da8557ef527abaf9c013bba5c636c552e9 Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
-Date: Tue, 10 Jul 2012 15:57:24 +0300
-Subject: [PATCH 01/25] ib_core: backport dst_fetch_ha
+Subject: [PATCH] ib_core: backport dst_fetch_ha
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
drivers/infiniband/core/addr.c | 58 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 58 insertions(+)
+ 1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
-index 6ef660c..984f61c 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -178,28 +178,45 @@ static void queue_req(struct addr_req *req)
put:
dst_release(dst);
return ret;
---
-1.7.9.5
-
-From b42650b2873504c84250c5876e684f8fc12b0d6b Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
-Date: Tue, 10 Jul 2012 17:21:25 +0300
-Subject: [PATCH 02/25] ib/core: Backport flowi4 and flowi6
+Subject: [PATCH] ib/core: Backport flowi4 and flowi6
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
drivers/infiniband/core/addr.c | 45 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 45 insertions(+)
+ 1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
-index 984f61c..089b076 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -225,22 +225,41 @@ static int addr4_resolve(struct sockaddr_in *src_in,
if (dst->dev->flags & IFF_LOOPBACK) {
ret = rdma_translate_ip((struct sockaddr *) dst_in, addr);
---
-1.7.9.5
-
-From 92ea29718f50d89695ed46cf409f789097b82d03 Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
-Date: Mon, 25 Jun 2012 22:28:24 +0300
-Subject: [PATCH 03/25] BACKPORT: core/netlink for kernels <= 3.4
+Subject: [PATCH] BACKPORT: core/netlink for kernels <= 3.4
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
drivers/infiniband/core/netlink.c | 6 ++++++
- 1 file changed, 6 insertions(+)
+ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
-index e497dfb..2ac867a 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -149,12 +149,18 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
}
}
---
-1.7.9.5
-
-From 0fd581905c953e5c0b3543d70fdd64dc6b7c681a Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
-Date: Tue, 10 Jul 2012 17:41:31 +0300
-Subject: [PATCH 04/25] ib/core: Backport pinned_vm for kernels <= 3.2
+Subject: [PATCH] ib/core: Backport pinned_vm for kernels <= 3.2
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
drivers/infiniband/core/umem.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ 1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
-index a841123..3b6cb84 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -137,7 +137,11 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
up_write(&mm->mmap_sem);
mmput(mm);
kfree(umem);
---
-1.7.9.5
-
-From c8179b3bb60fe0560f4b5558aca5e523df749f67 Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
-Date: Tue, 10 Jul 2012 18:06:16 +0300
-Subject: [PATCH 05/25] ib/core: Backport CLASS_ATTR for kernels < 2.6.34
+Subject: [PATCH] ib/core: Backport CLASS_ATTR for kernels < 2.6.34
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
drivers/infiniband/core/ucm.c | 20 ++++++++++++++++++++
drivers/infiniband/core/user_mad.c | 12 ++++++++++++
drivers/infiniband/core/uverbs_main.c | 12 ++++++++++++
- 3 files changed, 44 insertions(+)
+ 3 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
-index 06f0871..d74c8b3 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -1330,8 +1330,16 @@ static void ib_ucm_remove_one(struct ib_device *device)
if (overflow_maj)
unregister_chrdev_region(overflow_maj, IB_UCM_MAX_DEVICES);
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
-index f0d588f..2a31027 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -969,8 +969,16 @@ static ssize_t show_port(struct device *dev, struct device_attribute *attr,
printk(KERN_ERR "user_mad: couldn't create abi_version attribute\n");
goto out_class;
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
-index 604556d..4b0d8f3 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -715,8 +715,16 @@ static ssize_t show_dev_abi_version(struct device *device,
if (ret) {
printk(KERN_ERR "user_verbs: couldn't create abi_version attribute\n");
goto out_class;
---
-1.7.9.5
-
-From c41d75cc97ecf58160b708f328cae6765d933532 Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
-Date: Thu, 12 Jul 2012 22:31:24 +0300
-Subject: [PATCH 06/25] Backport mlx4_ib
+Subject: [PATCH] Backport mlx4_ib
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
drivers/infiniband/hw/mlx4/main.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
-index 3530c41..765bf3b 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -709,7 +709,11 @@ int mlx4_ib_add_mc(struct mlx4_ib_dev *mdev, struct mlx4_ib_qp *mqp,
rtnl_unlock();
dev_put(ndev);
}
---
-1.7.9.5
-
-From 74445f348a5d44dd172f3da3794ad08ecd8dda47 Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
-Date: Fri, 13 Jul 2012 00:24:56 +0300
-Subject: [PATCH 07/25] BACKPORT ucma: Revert sysctl registrations
+Subject: [PATCH] BACKPORT ucma: Revert sysctl registrations
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
drivers/infiniband/core/ucma.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
+ 1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
-index 8002ae6..5861cdb 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -66,6 +66,12 @@ static ctl_table ucma_ctl_table[] = {
device_remove_file(ucma_misc.this_device, &dev_attr_abi_version);
misc_deregister(&ucma_misc);
idr_destroy(&ctx_idr);
---
-1.7.9.5
-
-From 62e36abf5a81320929ecdfd96ec15ae7762843f3 Mon Sep 17 00:00:00 2001
From: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
-Date: Mon, 16 Jul 2012 17:14:31 +0300
-Subject: [PATCH 08/25] RDMA/nes: Backports for RHEL 6.2 and 6.3
+Subject: [PATCH] RDMA/nes: Backports for RHEL 6.2 and 6.3
Backports for linux-3.5 nes to RHEL-6.2 and RHEL-6.3
2 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
-index 020e95c..0b5b1a9 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1343,9 +1343,16 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
if (neigh) {
if (neigh->nud_state & NUD_VALID) {
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
-index f3a3ecf..d54776f 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -909,7 +909,11 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
nes_debug(NES_DBG_INIT, "nesvnic = %p, reported features = 0x%lX, QPid = %d,"
" nic_index = %d, logical_port = %d, mac_index = %d.\n",
---
-1.7.9.5
-
-From 049c8ba147e556fc1f1ad66a1e070aced80386e9 Mon Sep 17 00:00:00 2001
From: Vipul Pandya <vipul@chelsio.com>
-Date: Mon, 7 May 2012 12:43:41 +0530
-Subject: [PATCH 09/25] 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
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile
-index 2761364..c780a7a 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb3/Makefile
+++ b/drivers/infiniband/hw/cxgb3/Makefile
@@ -1,4 +1,4 @@
obj-$(CONFIG_INFINIBAND_CXGB3) += iw_cxgb3.o
diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile
-index e11cf72..2f9fbf3 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb4/Makefile
+++ b/drivers/infiniband/hw/cxgb4/Makefile
@@ -1,4 +1,4 @@
obj-$(CONFIG_INFINIBAND_CXGB4) += iw_cxgb4.o
---
-1.7.9.5
-
-From a7e9289daf473d3bcddfea383e9d8f8aef90cf58 Mon Sep 17 00:00:00 2001
From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Date: Thu, 2 Aug 2012 18:11:27 +0300
-Subject: [PATCH 10/25] IB/qib: backport qib_fs.c before 2.6.35
+Subject: [PATCH] IB/qib: backport qib_fs.c before 2.6.35
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
---
drivers/infiniband/hw/qib/qib_fs.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
+ 1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
-index 05e0f17..4ea3926 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -58,7 +58,9 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry,
.kill_sb = qibfs_kill_super,
};
---
-1.7.9.5
-
-From d505c64dcda186c1cf7248bf261567284284ffd9 Mon Sep 17 00:00:00 2001
From: Vipul Pandya <root@silicon.(none)>
-Date: Mon, 30 Jul 2012 19:08:37 +0530
-Subject: [PATCH 11/25] cxgb3: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2
+Subject: [PATCH] cxgb3: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2
Signed-off-by: Vipul Pandya <vipul@chelsio.com>
---
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 25 +++
drivers/net/ethernet/chelsio/cxgb3/l2t.c | 4 +
drivers/net/ethernet/chelsio/cxgb3/sge.c | 49 ++++++
- drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 17 +-
+ drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 17 ++-
7 files changed, 280 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb3/adapter.h b/drivers/net/ethernet/chelsio/cxgb3/adapter.h
-index 8b395b5..27bd384 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb3/adapter.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/adapter.h
@@ -45,10 +45,20 @@
struct net_device *netdev;
struct netdev_queue *tx_q; /* associated netdev TX queue */
diff --git a/drivers/net/ethernet/chelsio/cxgb3/common.h b/drivers/net/ethernet/chelsio/cxgb3/common.h
-index df01b63..9ef8b57 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb3/common.h
+++ b/drivers/net/ethernet/chelsio/cxgb3/common.h
@@ -317,6 +317,9 @@ struct tp_params {
unsigned int rspq_size; /* # of entries in response queue */
unsigned int fl_size; /* # of entries in regular free list */
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
-index abb6ce7..f800119 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -643,6 +643,28 @@ static void enable_all_napi(struct adapter *adap)
SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops);
}
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
-index 65e4b28..0dd8f2f 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -177,13 +177,26 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter,
return;
newdev = n->dev;
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
-index 3fa3c88..4206b33 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c
@@ -311,7 +311,11 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct dst_entry *dst,
goto done_rcu;
diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
-index cfb60e1..6be199f 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
@@ -2020,7 +2020,11 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq,
u32 len, flags;
__be32 rss_hi, rss_lo;
diff --git a/drivers/net/ethernet/chelsio/cxgb3/xgmac.c b/drivers/net/ethernet/chelsio/cxgb3/xgmac.c
-index 3af19a5..b3c99fd 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb3/xgmac.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/xgmac.c
@@ -311,17 +311,32 @@ int t3_mac_set_rx_mode(struct cmac *mac, struct net_device *dev)
if (hash < 32)
hash_lo |= (1 << hash);
else
---
-1.7.9.5
-
-From e95d29e72e1da4a34fe9a99c111755ff7ae46eb9 Mon Sep 17 00:00:00 2001
From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Date: Thu, 2 Aug 2012 18:11:27 +0300
-Subject: [PATCH 12/25] IB/qib: backport < 3.2 for pinned_vm field
+Subject: [PATCH] IB/qib: backport < 3.2 for pinned_vm field
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
---
drivers/infiniband/hw/qib/qib_user_pages.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
+ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c
-index 2bc1d2b..80d6ea5 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/qib/qib_user_pages.c
+++ b/drivers/infiniband/hw/qib/qib_user_pages.c
@@ -74,7 +74,11 @@ static int __qib_get_user_pages(unsigned long start_page, size_t num_pages,
up_write(¤t->mm->mmap_sem);
}
}
---
-1.7.9.5
-
-From 67fc061694dfa829043570007ccec9ff1d655ee3 Mon Sep 17 00:00:00 2001
From: Vipul Pandya <vipul@chelsio.com>
-Date: Mon, 30 Jul 2012 12:06:12 +0530
-Subject: [PATCH 13/25] cxgb4: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2
+Subject: [PATCH] cxgb4: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2
Signed-off-by: Vipul Pandya <vipul@chelsio.com>
---
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 13 ++
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 190 ++++++++++++++++++++++-
- drivers/net/ethernet/chelsio/cxgb4/sge.c | 72 ++++++++-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 72 +++++++++-
3 files changed, 273 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
-index ec2dafe..84fa932 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -300,6 +300,9 @@ struct port_info {
unsigned int nfrags; /* # of fragments */
unsigned int tot_len; /* total length of fragments */
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
-index e1f96fb..ec57e1c 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -31,7 +31,9 @@
netdev->netdev_ops = &cxgb4_netdev_ops;
SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
-index e111d97..b97bea7 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -216,8 +216,13 @@ static int map_skb(struct device *dev, const struct sk_buff *skb,
else
restore_rx_bufs(&si, &rxq->fl, frags);
} else if (likely(rsp_type == RSP_TYPE_CPL)) {
---
-1.7.9.5
-
-From 9c65408d4d69a2cbfd1e1c1ea34c35cf7414e89a Mon Sep 17 00:00:00 2001
From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Date: Thu, 2 Aug 2012 18:11:27 +0300
-Subject: [PATCH 14/25] IB/ipath: backport qib_fs.c before 2.6.35
+Subject: [PATCH] IB/ipath: backport qib_fs.c before 2.6.35
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
---
drivers/infiniband/hw/ipath/ipath_fs.c | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
+ 1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
-index a4de9d5..5ec9c66 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -57,7 +57,9 @@ static int ipathfs_mknod(struct inode *dir, struct dentry *dentry,
.kill_sb = ipathfs_kill_super,
};
---
-1.7.9.5
-
-From 1cec339ba2a68302d41192df5103f5d95a33364b Mon Sep 17 00:00:00 2001
From: Mike Marciniszyn <mike.marciniszyn@intel.com>
-Date: Thu, 2 Aug 2012 18:11:27 +0300
-Subject: [PATCH 15/25] IB/ipath: backport < 3.2 for pinned_vm field
+Subject: [PATCH] IB/ipath: backport < 3.2 for pinned_vm field
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
---
drivers/infiniband/hw/ipath/ipath_user_pages.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
+ 1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c
-index dc66c45..f2858e6 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c
@@ -79,7 +79,11 @@ static int __ipath_get_user_pages(unsigned long start_page, size_t num_pages,
up_write(&work->mm->mmap_sem);
mmput(work->mm);
kfree(work);
---
-1.7.9.5
-
-From b596dfe6f1296cb96361f7f95e49ddc641095be9 Mon Sep 17 00:00:00 2001
From: Vipul Pandya <vipul@chelsio.com>
-Date: Mon, 30 Jul 2012 12:38:36 +0530
-Subject: [PATCH 16/25] iw_cxgb3: Backports for RHEL6.2 RHEL 6.3 and SLES11
- SP2
+Subject: [PATCH] iw_cxgb3: Backports for RHEL6.2 RHEL 6.3 and SLES11 SP2
Signed-off-by: Vipul Pandya <vipul@chelsio.com>
---
drivers/infiniband/hw/cxgb3/iwch_cm.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
+ 1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
-index 740dcc0..c0b492f 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -338,12 +338,33 @@ static struct rtable *find_route(struct t3cdev *dev, __be32 local_ip,
ep->l2t = t3_l2t_get(ep->com.tdev, ep->dst, NULL);
if (!ep->l2t) {
printk(KERN_ERR MOD "%s - cannot alloc l2e.\n", __func__);
---
-1.7.9.5
-
-From e5eec669a7c0b85a2a4eae05684b61ade26b077a Mon Sep 17 00:00:00 2001
From: Vipul Pandya <root@silicon.(none)>
-Date: Mon, 30 Jul 2012 16:59:42 +0530
-Subject: [PATCH 17/25] iw_cxgb4: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2
+Subject: [PATCH] iw_cxgb4: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2
Signed-off-by: Vipul Pandya <root@silicon.(none)>
---
drivers/infiniband/hw/cxgb4/cm.c | 45 ++++++++++++++++++++++++++++++++
- drivers/infiniband/hw/cxgb4/cq.c | 12 +++++++++
+ drivers/infiniband/hw/cxgb4/cq.c | 12 ++++++++
drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 +++
- drivers/infiniband/hw/cxgb4/mem.c | 8 ++++++
+ drivers/infiniband/hw/cxgb4/mem.c | 8 +++++
drivers/infiniband/hw/cxgb4/qp.c | 17 +++++++++++-
- drivers/infiniband/hw/cxgb4/t4.h | 12 +++++++++
- 6 files changed, 97 insertions(+), 1 deletion(-)
+ drivers/infiniband/hw/cxgb4/t4.h | 12 ++++++++
+ 6 files changed, 97 insertions(+), 1 deletions(-)
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
-index b18870c..c1805bd 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -316,12 +316,33 @@ static struct rtable *find_route(struct c4iw_dev *dev, __be32 local_ip,
err = import_ep(ep, cm_id->remote_addr.sin_addr.s_addr,
ep->dst, ep->com.dev, true);
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
-index 0f1607c..550eb82 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -70,7 +70,11 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
kfree(cq->sw_queue);
err2:
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
-index 9beb3a9..9a9df48 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -359,7 +359,11 @@ static inline struct c4iw_mw *to_c4iw_mw(struct ib_mw *ibmw)
struct c4iw_dev *dev;
int size;
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
-index 57e07c6..375da95 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -764,7 +764,11 @@ struct ib_fast_reg_page_list *c4iw_alloc_fastreg_pbl(struct ib_device *device,
int c4iw_dereg_mr(struct ib_mr *ib_mr)
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
-index 45aedf1..e83249c 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -109,7 +109,11 @@ static int destroy_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
dealloc_sq(rdev, &wq->sq);
err5:
diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h
-index 16f26ab..cafdb7c 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb4/t4.h
+++ b/drivers/infiniband/hw/cxgb4/t4.h
@@ -296,7 +296,11 @@ enum {
struct t4_cqe *sw_queue;
void __iomem *gts;
struct c4iw_rdev *rdev;
---
-1.7.9.5
-
-From 23506f2107b334607305e2d34b760f2af6515186 Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
-Date: Thu, 2 Aug 2012 16:12:39 +0300
-Subject: [PATCH 18/25] IPoIB: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2
+Subject: [PATCH] IPoIB: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 21 +++++++++++++++++++++
drivers/infiniband/ulp/ipoib/ipoib_main.c | 18 ++++++++++++++++++
drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 19 +++++++++++++++++++
- 4 files changed, 61 insertions(+)
+ 4 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
-index 86df632..a876f24 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -92,6 +92,9 @@ enum {
IPOIB_MAX_BACKOFF_SECONDS = 16,
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
-index 014504d..b83efdf 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1378,7 +1378,11 @@ static void ipoib_cm_skb_reap(struct work_struct *work)
rtnl_unlock();
ipoib_flush_paths(dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
-index 3974c29..f35bd5c 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -171,6 +171,7 @@ static int ipoib_stop(struct net_device *dev)
result = ib_query_pkey(hca, port, 0, &priv->pkey);
if (result) {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-index 20ebc6f..4a4c64a 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -720,7 +720,11 @@ out:
mcast = __ipoib_mcast_find(dev, &mgid);
if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
---
-1.7.9.5
-
-From 1625ace4f5f1fa23ac03766ad4a201684fc998a6 Mon Sep 17 00:00:00 2001
From: Vladimir Sokolovsky <vlad@mellanox.com>
-Date: Sun, 5 Aug 2012 22:00:42 +0300
-Subject: [PATCH 19/25] mlx4_en: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2
+Subject: [PATCH] mlx4_en: Backports for RHEL6.2 RHEL6.3 and SLES11 SP2
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 29 ++++++++++++
drivers/net/ethernet/mellanox/mlx4/en_rx.c | 56 +++++++++++++++++++++++
drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 ++
- 4 files changed, 93 insertions(+)
+ 4 files changed, 93 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
-index 72901ce..332e851 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -528,6 +528,7 @@ static void mlx4_en_get_ringparam(struct net_device *dev,
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
-index 073b85b..2a53952 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -45,6 +45,7 @@
mdev->pndev[port] = dev;
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
-index d49a7ac..ae1c6a9 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -44,7 +44,11 @@
/* If source MAC is equal to our own MAC and not performing
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
-index 019d856..5a2bddd 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -529,7 +529,11 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb)
return skb_tx_hash(dev, skb);
if (vlan_tx_tag_present(skb))
---
-1.7.9.5
-
-From b824c830e756c1466a7a84109b9954d2772586b9 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeffrey.c.becker@nasa.gov>
-Date: Fri, 24 Aug 2012 11:18:23 -0700
-Subject: [PATCH 20/25] NFSRDMA: RHEL6.3 and SLES11 SP2 backport
+Subject: [PATCH] NFSRDMA: RHEL6.3 and SLES11 SP2 backport
Signed-off-by: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
---
net/sunrpc/xprtrdma/rpc_rdma.c | 16 ++++++++++++++++
net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 ++++
net/sunrpc/xprtrdma/transport.c | 12 ++++++++++++
- 3 files changed, 32 insertions(+)
+ 3 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
-index 558fbab..0a6c1db 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@ -338,9 +338,17 @@ rpcrdma_inline_pullup(struct rpc_rqst *rqst, int pad)
copy_len -= curlen;
if (copy_len == 0)
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-index 73b428b..325e9fd 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -445,7 +445,11 @@ static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv,
INIT_LIST_HEAD(&cma_xprt->sc_dto_q);
INIT_LIST_HEAD(&cma_xprt->sc_rq_dto_q);
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
-index b446e10..9419f34 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -283,7 +283,9 @@ xprt_setup_rdma(struct xprt_create *args)
}
/*
---
-1.7.9.5
-
-From 40378c271c9fbbb445c7c1233444c795004d6232 Mon Sep 17 00:00:00 2001
From: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
-Date: Sat, 25 Aug 2012 20:39:12 -0500
-Subject: [PATCH 21/25] RDMA/nes: Updated backports
+Subject: [PATCH] RDMA/nes: Updated backports
OFED-3.5/NES: Updated backports to be applied on top of the previously submitted backport patch.
Signed-off-by: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
---
drivers/infiniband/hw/nes/nes_hw.c | 11 ++++++++
- drivers/infiniband/hw/nes/nes_hw.h | 3 +++
- drivers/infiniband/hw/nes/nes_nic.c | 49 ++++++++++++++++++++++++++++-------
+ drivers/infiniband/hw/nes/nes_hw.h | 3 ++
+ drivers/infiniband/hw/nes/nes_nic.c | 49 ++++++++++++++++++++++++++++------
3 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
-index d42c9f4..259faab 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2951,7 +2951,18 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
if (nes_use_lro)
lro_receive_skb(&nesvnic->lro_mgr, rx_skb, NULL);
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h
-index d748e4b..b4a31de 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/nes/nes_hw.h
+++ b/drivers/infiniband/hw/nes/nes_hw.h
@@ -1236,6 +1236,9 @@ struct nes_vnic {
atomic_t rx_skb_timer_running;
int budget;
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
-index d54776f..696b80e 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1597,6 +1597,33 @@ static const struct ethtool_ops nes_ethtool_ops = {
return netdev;
}
---
-1.7.9.5
-
-From 9a2a5815ae4484d558d115380256a092ee08554e Mon Sep 17 00:00:00 2001
From: Vipul Pandya <vipul@chelsio.com>
-Date: Fri, 21 Sep 2012 04:53:36 -0700
-Subject: [PATCH 22/25] iw_cxgb4: Fix bug 2369 in OFED bugzilla
+Subject: [PATCH] iw_cxgb4: Fix bug 2369 in OFED bugzilla
Bug 2369 - [OFED-3.5] Trace observed in dmesg while running IMB-MPI1 using
openmpi-1.6
Signed-off-by: Vipul Pandya <vipul@chelsio.com>
---
drivers/infiniband/hw/cxgb4/cm.c | 2 ++
- 1 file changed, 2 insertions(+)
+ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
-index c1805bd..d6fea23 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -1672,7 +1672,9 @@ static int import_ep(struct c4iw_ep *ep, __be32 peer_ip, struct dst_entry *dst,
return err;
}
---
-1.7.9.5
-
-From 5ebf4547e291d3f94ae4e13956a7c3635896520a Mon Sep 17 00:00:00 2001
From: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
-Date: Fri, 7 Sep 2012 19:41:29 -0500
-Subject: [PATCH 23/25] RDMA/nes: Fix for loopback MAC address - Backport
- change
+Subject: [PATCH] RDMA/nes: Fix for loopback MAC address - Backport change
RDMA/nes: Fix for resolving correctly the MAC address for loopback connection
(the patch should be applied on top of previous backports)
Signed-off-by: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
---
drivers/infiniband/hw/nes/nes_cm.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
+ 1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
-index 0b5b1a9..d9fa245 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1363,11 +1363,8 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi
rcu_read_lock();
if (neigh) {
if (neigh->nud_state & NUD_VALID) {
---
-1.7.9.5
-
-From 7bbcd56628309225e630e511e612cd3b82762294 Mon Sep 17 00:00:00 2001
From: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
-Date: Fri, 7 Sep 2012 19:45:21 -0500
-Subject: [PATCH 24/25] RDMA/nes: TSO is enabled again for linux-3.5 -
- Backport change
+Subject: [PATCH] RDMA/nes: TSO is enabled again for linux-3.5 - Backport change
RDMA/nes: TSO is enabled again for linux-3.5
(the patch should be applied on top of previous backports)
Signed-off-by: Tatyana Nikolova <Tatyana.E.Nikolova@intel.com>
---
drivers/infiniband/hw/nes/nes_nic.c | 2 --
- 1 file changed, 2 deletions(-)
+ 1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
-index 696b80e..7674358 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -1760,12 +1760,10 @@ struct net_device *nes_netdev_init(struct nes_device *nesdev,
}
nes_debug(NES_DBG_INIT, "nesvnic = %p, reported features = 0x%lX, QPid = %d,"
---
-1.7.9.5
-
-From a9832b255f02b99997a13e2d25698f1228292cf4 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
-Date: Wed, 12 Sep 2012 14:31:04 +0200
-Subject: [PATCH 25/25] ib_srp: Backport to older kernels
+Subject: [PATCH] ib_srp: Backport to older kernels
This patch has been tested on RHEL 6.0, RHEL 6.1, RHEL 6.2, RHEL 6.3
and Ubuntu 10.04.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
- drivers/infiniband/ulp/srp/ib_srp.c | 111 ++++++++++++++++++++++++++++++++++-
- 1 file changed, 108 insertions(+), 3 deletions(-)
+ drivers/infiniband/ulp/srp/ib_srp.c | 91 +++++++++++++++++++++++++++++++++--
+ 1 files changed, 86 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
-index bcbf22e..d42e9c4 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -30,8 +30,13 @@
}
module_init(srp_init_module);
---
-1.7.9.5
-
-From 220329916c72ee3d54ae7262b215a050f04a18fc Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
-Date: Tue, 14 Aug 2012 13:18:53 +0000
Subject: [PATCH] IB/srp: Fix a race condition
Avoid a crash caused by the scmnd->scsi_done(scmnd) call in
Signed-off-by: Roland Dreier <roland@purestorage.com>
---
drivers/infiniband/ulp/srp/ib_srp.c | 87 +++++++++++++++++++++++++----------
- 1 file changed, 63 insertions(+), 24 deletions(-)
+ 1 files changed, 63 insertions(+), 24 deletions(-)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
-index bcbf22e..1b5b0c7 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
-@@ -586,24 +586,62 @@ static void srp_unmap_data(struct scsi_cmnd *scmnd,
+@@ -602,24 +602,62 @@ static void srp_unmap_data(struct scsi_cmnd *scmnd,
scmnd->sc_data_direction);
}
}
static int srp_reconnect_target(struct srp_target_port *target)
-@@ -1073,11 +1111,18 @@ static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
+@@ -1089,11 +1127,18 @@ static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
complete(&target->tsk_mgmt_done);
} else {
req = &target->req_ring[rsp->tag];
scmnd->result = rsp->status;
if (rsp->flags & SRP_RSP_FLAG_SNSVALID) {
-@@ -1092,7 +1137,9 @@ static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
+@@ -1108,7 +1153,9 @@ static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
else if (rsp->flags & (SRP_RSP_FLAG_DIOVER | SRP_RSP_FLAG_DIUNDER))
scsi_set_resid(scmnd, be32_to_cpu(rsp->data_in_res_cnt));
scmnd->host_scribble = NULL;
scmnd->scsi_done(scmnd);
}
-@@ -1631,25 +1678,17 @@ static int srp_abort(struct scsi_cmnd *scmnd)
+@@ -1690,25 +1737,17 @@ static int srp_abort(struct scsi_cmnd *scmnd)
{
struct srp_target_port *target = host_to_target(scmnd->device->host);
struct srp_request *req = (struct srp_request *) scmnd->host_scribble;
}
static int srp_reset_device(struct scsi_cmnd *scmnd)
---
-1.7.10.4
-
-From 9b796d06d5d1b1e85ae2316a283ea11dd739ef96 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
-Date: Fri, 24 Aug 2012 10:27:54 +0000
Subject: [PATCH] IB/srp: Fix use-after-free in srp_reset_req()
srp_free_req() uses the scsi_cmnd structure contents to unmap
Signed-off-by: Roland Dreier <roland@purestorage.com>
---
drivers/infiniband/ulp/srp/ib_srp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
-index 1b5b0c7..ac66e6b 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
-@@ -638,9 +638,9 @@ static void srp_reset_req(struct srp_target_port *target, struct srp_request *re
+@@ -654,9 +654,9 @@ static void srp_reset_req(struct srp_target_port *target, struct srp_request *re
struct scsi_cmnd *scmnd = srp_claim_req(target, req, NULL);
if (scmnd) {
}
}
---
-1.7.10.4
-
-From d8536670916a685df116b5c2cb256573fd25e4e3 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
-Date: Fri, 24 Aug 2012 10:29:11 +0000
Subject: [PATCH] IB/srp: Avoid having aborted requests hang
We need to call scsi_done() for commands after we abort them.
Signed-off-by: Roland Dreier <roland@purestorage.com>
---
drivers/infiniband/ulp/srp/ib_srp.c | 1 +
- 1 file changed, 1 insertion(+)
+ 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
-index ac66e6b..922d845 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
-@@ -1687,6 +1687,7 @@ static int srp_abort(struct scsi_cmnd *scmnd)
+@@ -1746,6 +1746,7 @@ static int srp_abort(struct scsi_cmnd *scmnd)
SRP_TSK_ABORT_TASK);
srp_free_req(target, req, scmnd, 0);
scmnd->result = DID_ABORT << 16;
return SUCCESS;
}
---
-1.7.10.4
-
--- /dev/null
+From: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
+Subject: [PATCH] Added backports for RHEL 6.2 and 6.3 ethtool ops.
+
+Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
+---
+ drivers/infiniband/hw/nes/nes_hw.c | 10 ++++++++
+ drivers/infiniband/hw/nes/nes_hw.h | 3 ++
+ drivers/infiniband/hw/nes/nes_nic.c | 43 +++++++++++++++++++++++++++++++++++
+ 3 files changed, 56 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
+index xxxxxxx..xxxxxxx xxxxxx
+--- a/drivers/infiniband/hw/nes/nes_hw.c
++++ b/drivers/infiniband/hw/nes/nes_hw.c
+@@ -2912,8 +2912,13 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
+ if ((cqe_errv &
+ (NES_NIC_ERRV_BITS_IPV4_CSUM_ERR | NES_NIC_ERRV_BITS_TCPUDP_CSUM_ERR |
+ NES_NIC_ERRV_BITS_IPH_ERR | NES_NIC_ERRV_BITS_WQE_OVERRUN)) == 0) {
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
++ if (nesvnic->rx_checksum_disabled == 0)
++ rx_skb->ip_summed = CHECKSUM_UNNECESSARY;
++#else
+ if (nesvnic->netdev->features & NETIF_F_RXCSUM)
+ rx_skb->ip_summed = CHECKSUM_UNNECESSARY;
++#endif
+ } else
+ nes_debug(NES_DBG_CQ, "%s: unsuccessfully checksummed TCP or UDP packet."
+ " errv = 0x%X, pkt_type = 0x%X.\n",
+@@ -2923,11 +2928,16 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
+ if ((cqe_errv &
+ (NES_NIC_ERRV_BITS_IPV4_CSUM_ERR | NES_NIC_ERRV_BITS_IPH_ERR |
+ NES_NIC_ERRV_BITS_WQE_OVERRUN)) == 0) {
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
++ if (nesvnic->rx_checksum_disabled == 0)
++ rx_skb->ip_summed = CHECKSUM_UNNECESSARY;
++#else
+ if (nesvnic->netdev->features & NETIF_F_RXCSUM) {
+ rx_skb->ip_summed = CHECKSUM_UNNECESSARY;
+ /* nes_debug(NES_DBG_CQ, "%s: Reporting successfully checksummed IPv4 packet.\n",
+ nesvnic->netdev->name); */
+ }
++#endif
+ } else
+ nes_debug(NES_DBG_CQ, "%s: unsuccessfully checksummed TCP or UDP packet."
+ " errv = 0x%X, pkt_type = 0x%X.\n",
+diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h
+index xxxxxxx..xxxxxxx xxxxxx
+--- a/drivers/infiniband/hw/nes/nes_hw.h
++++ b/drivers/infiniband/hw/nes/nes_hw.h
+@@ -1272,6 +1272,9 @@ struct nes_vnic {
+ u8 next_qp_nic_index;
+ u8 of_device_registered;
+ u8 rdma_enabled;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
++ u8 rx_checksum_disabled;
++#endif
+ u32 lro_max_aggr;
+ struct net_lro_mgr lro_mgr;
+ struct net_lro_desc lro_desc[NES_MAX_LRO_DESCRIPTORS];
+diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
+index xxxxxxx..xxxxxxx xxxxxx
+--- a/drivers/infiniband/hw/nes/nes_nic.c
++++ b/drivers/infiniband/hw/nes/nes_nic.c
+@@ -1105,6 +1105,37 @@ static const char nes_ethtool_stringset[][ETH_GSTRING_LEN] = {
+ #define NES_ETHTOOL_STAT_COUNT ARRAY_SIZE(nes_ethtool_stringset)
+
+
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
++/**
++ * nes_netdev_get_rx_csum
++ */
++static u32 nes_netdev_get_rx_csum (struct net_device *netdev)
++{
++ struct nes_vnic *nesvnic = netdev_priv(netdev);
++
++ if (nesvnic->rx_checksum_disabled)
++ return 0;
++ else
++ return 1;
++}
++
++
++/**
++ * nes_netdev_set_rc_csum
++ */
++static int nes_netdev_set_rx_csum(struct net_device *netdev, u32 enable)
++{
++ struct nes_vnic *nesvnic = netdev_priv(netdev);
++
++ if (enable)
++ nesvnic->rx_checksum_disabled = 0;
++ else
++ nesvnic->rx_checksum_disabled = 1;
++ return 0;
++}
++#endif
++
++
+ /**
+ * nes_netdev_get_sset_count
+ */
+@@ -1595,6 +1626,18 @@ static const struct ethtool_ops nes_ethtool_ops = {
+ .set_coalesce = nes_netdev_set_coalesce,
+ .get_pauseparam = nes_netdev_get_pauseparam,
+ .set_pauseparam = nes_netdev_set_pauseparam,
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
++ .get_tx_csum = ethtool_op_get_tx_csum,
++ .set_tx_csum = ethtool_op_set_tx_csum,
++ .get_rx_csum = nes_netdev_get_rx_csum,
++ .set_rx_csum = nes_netdev_set_rx_csum,
++ .get_sg = ethtool_op_get_sg,
++ .set_sg = ethtool_op_set_sg,
++ .get_tso = ethtool_op_get_tso,
++ .set_tso = ethtool_op_set_tso,
++ .get_flags = ethtool_op_get_flags,
++ .set_flags = ethtool_op_set_flags,
++#endif
+ };
+
+
+++ /dev/null
-Added backports for RHEL 6.2 and 6.3 ethtool ops.
-
-Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
----
- drivers/infiniband/hw/nes/nes_hw.c | 10 ++++++++
- drivers/infiniband/hw/nes/nes_hw.h | 3 ++
- drivers/infiniband/hw/nes/nes_nic.c | 43 +++++++++++++++++++++++++++++++++++
- 3 files changed, 56 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
-index eff10e1..61f9d8d 100644
---- a/drivers/infiniband/hw/nes/nes_hw.c
-+++ b/drivers/infiniband/hw/nes/nes_hw.c
-@@ -2911,8 +2911,13 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
- if ((cqe_errv &
- (NES_NIC_ERRV_BITS_IPV4_CSUM_ERR | NES_NIC_ERRV_BITS_TCPUDP_CSUM_ERR |
- NES_NIC_ERRV_BITS_IPH_ERR | NES_NIC_ERRV_BITS_WQE_OVERRUN)) == 0) {
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
-+ if (nesvnic->rx_checksum_disabled == 0)
-+ rx_skb->ip_summed = CHECKSUM_UNNECESSARY;
-+#else
- if (nesvnic->netdev->features & NETIF_F_RXCSUM)
- rx_skb->ip_summed = CHECKSUM_UNNECESSARY;
-+#endif
- } else
- nes_debug(NES_DBG_CQ, "%s: unsuccessfully checksummed TCP or UDP packet."
- " errv = 0x%X, pkt_type = 0x%X.\n",
-@@ -2922,11 +2927,16 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
- if ((cqe_errv &
- (NES_NIC_ERRV_BITS_IPV4_CSUM_ERR | NES_NIC_ERRV_BITS_IPH_ERR |
- NES_NIC_ERRV_BITS_WQE_OVERRUN)) == 0) {
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
-+ if (nesvnic->rx_checksum_disabled == 0)
-+ rx_skb->ip_summed = CHECKSUM_UNNECESSARY;
-+#else
- if (nesvnic->netdev->features & NETIF_F_RXCSUM) {
- rx_skb->ip_summed = CHECKSUM_UNNECESSARY;
- /* nes_debug(NES_DBG_CQ, "%s: Reporting successfully checksummed IPv4 packet.\n",
- nesvnic->netdev->name); */
- }
-+#endif
- } else
- nes_debug(NES_DBG_CQ, "%s: unsuccessfully checksummed TCP or UDP packet."
- " errv = 0x%X, pkt_type = 0x%X.\n",
-diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h
-index b4a31de..b31222a 100644
---- a/drivers/infiniband/hw/nes/nes_hw.h
-+++ b/drivers/infiniband/hw/nes/nes_hw.h
-@@ -1272,6 +1272,9 @@ struct nes_vnic {
- u8 next_qp_nic_index;
- u8 of_device_registered;
- u8 rdma_enabled;
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
-+ u8 rx_checksum_disabled;
-+#endif
- u32 lro_max_aggr;
- struct net_lro_mgr lro_mgr;
- struct net_lro_desc lro_desc[NES_MAX_LRO_DESCRIPTORS];
-diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
-index f3d73d0..d113dac 100644
---- a/drivers/infiniband/hw/nes/nes_nic.c
-+++ b/drivers/infiniband/hw/nes/nes_nic.c
-@@ -1104,6 +1104,37 @@ static const char nes_ethtool_stringset[][ETH_GSTRING_LEN] = {
- #define NES_ETHTOOL_STAT_COUNT ARRAY_SIZE(nes_ethtool_stringset)
-
-
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
-+/**
-+ * nes_netdev_get_rx_csum
-+ */
-+static u32 nes_netdev_get_rx_csum (struct net_device *netdev)
-+{
-+ struct nes_vnic *nesvnic = netdev_priv(netdev);
-+
-+ if (nesvnic->rx_checksum_disabled)
-+ return 0;
-+ else
-+ return 1;
-+}
-+
-+
-+/**
-+ * nes_netdev_set_rc_csum
-+ */
-+static int nes_netdev_set_rx_csum(struct net_device *netdev, u32 enable)
-+{
-+ struct nes_vnic *nesvnic = netdev_priv(netdev);
-+
-+ if (enable)
-+ nesvnic->rx_checksum_disabled = 0;
-+ else
-+ nesvnic->rx_checksum_disabled = 1;
-+ return 0;
-+}
-+#endif
-+
-+
- /**
- * nes_netdev_get_sset_count
- */
-@@ -1594,6 +1625,18 @@ static const struct ethtool_ops nes_ethtool_ops = {
- .set_coalesce = nes_netdev_set_coalesce,
- .get_pauseparam = nes_netdev_get_pauseparam,
- .set_pauseparam = nes_netdev_set_pauseparam,
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0))
-+ .get_tx_csum = ethtool_op_get_tx_csum,
-+ .set_tx_csum = ethtool_op_set_tx_csum,
-+ .get_rx_csum = nes_netdev_get_rx_csum,
-+ .set_rx_csum = nes_netdev_set_rx_csum,
-+ .get_sg = ethtool_op_get_sg,
-+ .set_sg = ethtool_op_set_sg,
-+ .get_tso = ethtool_op_get_tso,
-+ .set_tso = ethtool_op_set_tso,
-+ .get_flags = ethtool_op_get_flags,
-+ .set_flags = ethtool_op_set_flags,
-+#endif
- };
-
-
---
-1.7.4.2
-
--- /dev/null
+From: Rupert Dance <rsdance@soft-forge.com>
+Subject: [PATCH] Add RHEL6.4 support
+
+Signed-off-by: Rupert Dance <rsdance@soft-forge.com>
+---
+ drivers/infiniband/core/netlink.c | 6 ++++--
+ drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 4 ++++
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
+index xxxxxxx..xxxxxxx xxxxxx
+--- a/drivers/infiniband/core/netlink.c
++++ b/drivers/infiniband/core/netlink.c
+@@ -30,7 +30,9 @@
+ * SOFTWARE.
+ */
+
++#ifndef pr_fmt
+ #define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
++#endif
+
+ #include <linux/export.h>
+ #include <net/netlink.h>
+@@ -149,7 +151,7 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ !client->cb_table[RDMA_NL_GET_OP(op)].dump)
+ return -EINVAL;
+
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
++#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || CONFIG_COMPAT_RHEL_6_4)
+ {
+ struct netlink_dump_control c = {
+ .dump = client->cb_table[op].dump,
+@@ -160,7 +162,7 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ return netlink_dump_start(nls, skb, nlh,
+ client->cb_table[op].dump,
+ NULL, 0);
+-#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) */
++#endif /* ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || CONFIG_COMPAT_RHEL_6_4) */
+ }
+ }
+
+diff --git a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+index xxxxxxx..xxxxxxx xxxxxx
+--- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
++++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+@@ -200,6 +200,7 @@ static u8 mlx4_en_dcbnl_setdcbx(struct net_device *dev, u8 mode)
+ return 0;
+ }
+
++#ifndef CONFIG_COMPAT_RHEL_6_4
+ #define MLX4_RATELIMIT_UNITS_IN_KB 100000 /* rate-limit HW unit in Kbps */
+ static int mlx4_en_dcbnl_ieee_getmaxrate(struct net_device *dev,
+ struct ieee_maxrate *maxrate)
+@@ -241,12 +242,15 @@ static int mlx4_en_dcbnl_ieee_setmaxrate(struct net_device *dev,
+
+ return 0;
+ }
++#endif /* CONFIG_COMPAT_RHEL_6_4 */
+
+ const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops = {
+ .ieee_getets = mlx4_en_dcbnl_ieee_getets,
+ .ieee_setets = mlx4_en_dcbnl_ieee_setets,
++#ifndef CONFIG_COMPAT_RHEL_6_4
+ .ieee_getmaxrate = mlx4_en_dcbnl_ieee_getmaxrate,
+ .ieee_setmaxrate = mlx4_en_dcbnl_ieee_setmaxrate,
++#endif /* CONFIG_COMPAT_RHEL_6_4 */
+ .ieee_getpfc = mlx4_en_dcbnl_ieee_getpfc,
+ .ieee_setpfc = mlx4_en_dcbnl_ieee_setpfc,
+
+++ /dev/null
-diff -Nrup a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
---- a/drivers/infiniband/core/netlink.c 2013-02-14 08:47:02.000000000 -0800
-+++ b/drivers/infiniband/core/netlink.c 2013-03-05 16:13:24.026999790 -0800
-@@ -30,7 +30,9 @@
- * SOFTWARE.
- */
-
-+#ifndef pr_fmt
- #define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
-+#endif
-
- #include <linux/export.h>
- #include <net/netlink.h>
-@@ -149,7 +151,7 @@ static int ibnl_rcv_msg(struct sk_buff *
- !client->cb_table[RDMA_NL_GET_OP(op)].dump)
- return -EINVAL;
-
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || CONFIG_COMPAT_RHEL_6_4)
- {
- struct netlink_dump_control c = {
- .dump = client->cb_table[op].dump,
-@@ -160,7 +162,7 @@ static int ibnl_rcv_msg(struct sk_buff *
- return netlink_dump_start(nls, skb, nlh,
- client->cb_table[op].dump,
- NULL, 0);
--#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) */
-+#endif /* ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || CONFIG_COMPAT_RHEL_6_4) */
- }
- }
-
-diff -Nrup a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
---- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c 2013-02-14 08:47:01.000000000 -0800
-+++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c 2013-03-05 16:13:24.026999790 -0800
-@@ -200,6 +200,7 @@ static u8 mlx4_en_dcbnl_setdcbx(struct n
- return 0;
- }
-
-+#ifndef CONFIG_COMPAT_RHEL_6_4
- #define MLX4_RATELIMIT_UNITS_IN_KB 100000 /* rate-limit HW unit in Kbps */
- static int mlx4_en_dcbnl_ieee_getmaxrate(struct net_device *dev,
- struct ieee_maxrate *maxrate)
-@@ -241,12 +242,15 @@ static int mlx4_en_dcbnl_ieee_setmaxrate
-
- return 0;
- }
-+#endif /* CONFIG_COMPAT_RHEL_6_4 */
-
- const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops = {
- .ieee_getets = mlx4_en_dcbnl_ieee_getets,
- .ieee_setets = mlx4_en_dcbnl_ieee_setets,
-+#ifndef CONFIG_COMPAT_RHEL_6_4
- .ieee_getmaxrate = mlx4_en_dcbnl_ieee_getmaxrate,
- .ieee_setmaxrate = mlx4_en_dcbnl_ieee_setmaxrate,
-+#endif /* CONFIG_COMPAT_RHEL_6_4 */
- .ieee_getpfc = mlx4_en_dcbnl_ieee_getpfc,
- .ieee_setpfc = mlx4_en_dcbnl_ieee_setpfc,
-
--- /dev/null
+From: Vladimir Sokolovsky <vlad@mellanox.com>
+Subject: [PATCH] Added support for SLES11SP3
+
+Signed-off-by: Robert J Woodruff <robert.j.woodruff@intel.com>
+Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
+---
+ drivers/infiniband/core/netlink.c | 10 ++++++++--
+ drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c | 8 ++++----
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
+index xxxxxxx..xxxxxxx xxxxxx
+--- a/drivers/infiniband/core/netlink.c
++++ b/drivers/infiniband/core/netlink.c
+@@ -151,7 +151,12 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ !client->cb_table[RDMA_NL_GET_OP(op)].dump)
+ return -EINVAL;
+
+-#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || CONFIG_COMPAT_RHEL_6_4)
++#ifdef CONFIG_COMPAT_SLES_11_3
++ return netlink_dump_start(nls, skb, nlh,
++ client->cb_table[op].dump,
++ NULL, 0);
++#else
++#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || defined(CONFIG_COMPAT_RHEL_6_4))
+ {
+ struct netlink_dump_control c = {
+ .dump = client->cb_table[op].dump,
+@@ -162,7 +167,8 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ return netlink_dump_start(nls, skb, nlh,
+ client->cb_table[op].dump,
+ NULL, 0);
+-#endif /* ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || CONFIG_COMPAT_RHEL_6_4) */
++#endif /* ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || defined(CONFIG_COMPAT_RHEL_6_4)) */
++#endif /* CONFIG_COMPAT_SLES_11_3 */
+ }
+ }
+
+diff --git a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+index xxxxxxx..xxxxxxx xxxxxx
+--- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
++++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
+@@ -200,7 +200,7 @@ static u8 mlx4_en_dcbnl_setdcbx(struct net_device *dev, u8 mode)
+ return 0;
+ }
+
+-#ifndef CONFIG_COMPAT_RHEL_6_4
++#if (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3))
+ #define MLX4_RATELIMIT_UNITS_IN_KB 100000 /* rate-limit HW unit in Kbps */
+ static int mlx4_en_dcbnl_ieee_getmaxrate(struct net_device *dev,
+ struct ieee_maxrate *maxrate)
+@@ -242,15 +242,15 @@ static int mlx4_en_dcbnl_ieee_setmaxrate(struct net_device *dev,
+
+ return 0;
+ }
+-#endif /* CONFIG_COMPAT_RHEL_6_4 */
++#endif /* (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3)) */
+
+ const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops = {
+ .ieee_getets = mlx4_en_dcbnl_ieee_getets,
+ .ieee_setets = mlx4_en_dcbnl_ieee_setets,
+-#ifndef CONFIG_COMPAT_RHEL_6_4
++#if (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3))
+ .ieee_getmaxrate = mlx4_en_dcbnl_ieee_getmaxrate,
+ .ieee_setmaxrate = mlx4_en_dcbnl_ieee_setmaxrate,
+-#endif /* CONFIG_COMPAT_RHEL_6_4 */
++#endif /* (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3)) */
+ .ieee_getpfc = mlx4_en_dcbnl_ieee_getpfc,
+ .ieee_setpfc = mlx4_en_dcbnl_ieee_setpfc,
+
+++ /dev/null
-diff -Nrup a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
---- a/drivers/infiniband/core/netlink.c 2013-06-24 11:26:54.000000000 -0700
-+++ b/drivers/infiniband/core/netlink.c 2013-06-27 14:53:58.000000000 -0700
-@@ -151,7 +151,12 @@ static int ibnl_rcv_msg(struct sk_buff *
- !client->cb_table[RDMA_NL_GET_OP(op)].dump)
- return -EINVAL;
-
--#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || CONFIG_COMPAT_RHEL_6_4)
-+#ifdef CONFIG_COMPAT_SLES_11_3
-+ return netlink_dump_start(nls, skb, nlh,
-+ client->cb_table[op].dump,
-+ NULL, 0);
-+#else
-+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || defined(CONFIG_COMPAT_RHEL_6_4))
- {
- struct netlink_dump_control c = {
- .dump = client->cb_table[op].dump,
-@@ -162,7 +167,8 @@ static int ibnl_rcv_msg(struct sk_buff *
- return netlink_dump_start(nls, skb, nlh,
- client->cb_table[op].dump,
- NULL, 0);
--#endif /* ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || CONFIG_COMPAT_RHEL_6_4) */
-+#endif /* ((LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) || defined(CONFIG_COMPAT_RHEL_6_4)) */
-+#endif /* CONFIG_COMPAT_SLES_11_3 */
- }
- }
-
-diff -Nrup a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
---- a/drivers/infiniband/hw/cxgb4/cm.c 2013-06-24 11:26:54.000000000 -0700
-+++ b/drivers/infiniband/hw/cxgb4/cm.c 2013-06-27 14:43:42.000000000 -0700
-@@ -1601,6 +1601,8 @@ static int c4iw_reconnect(struct c4iw_ep
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
- neigh = dst_neigh_lookup(ep->dst,
- &ep->com.cm_id->remote_addr.sin_addr.s_addr);
-+#elif defined(CONFIG_COMPAT_SLES_11_3)
-+ neigh = ep->dst->_neighbour;
- #else
- neigh = ep->dst->neighbour;
- #endif
-@@ -3107,6 +3109,8 @@ static int rx_pkt(struct c4iw_dev *dev,
- neigh = dst_neigh_lookup_skb(dst, skb);
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
- neigh = dst->_neighbour;
-+#elif defined(CONFIG_COMPAT_SLES_11_3)
-+ neigh = dst->_neighbour;
- #else
- neigh = dst->neighbour;
- #endif
-diff -Nrup a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
---- a/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c 2013-06-24 11:26:54.000000000 -0700
-+++ b/drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c 2013-06-27 14:43:42.000000000 -0700
-@@ -200,7 +200,7 @@ static u8 mlx4_en_dcbnl_setdcbx(struct n
- return 0;
- }
-
--#ifndef CONFIG_COMPAT_RHEL_6_4
-+#if (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3))
- #define MLX4_RATELIMIT_UNITS_IN_KB 100000 /* rate-limit HW unit in Kbps */
- static int mlx4_en_dcbnl_ieee_getmaxrate(struct net_device *dev,
- struct ieee_maxrate *maxrate)
-@@ -242,15 +242,15 @@ static int mlx4_en_dcbnl_ieee_setmaxrate
-
- return 0;
- }
--#endif /* CONFIG_COMPAT_RHEL_6_4 */
-+#endif /* (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3)) */
-
- const struct dcbnl_rtnl_ops mlx4_en_dcbnl_ops = {
- .ieee_getets = mlx4_en_dcbnl_ieee_getets,
- .ieee_setets = mlx4_en_dcbnl_ieee_setets,
--#ifndef CONFIG_COMPAT_RHEL_6_4
-+#if (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3))
- .ieee_getmaxrate = mlx4_en_dcbnl_ieee_getmaxrate,
- .ieee_setmaxrate = mlx4_en_dcbnl_ieee_setmaxrate,
--#endif /* CONFIG_COMPAT_RHEL_6_4 */
-+#endif /* (!defined(CONFIG_COMPAT_RHEL_6_4) && !defined(CONFIG_COMPAT_SLES_11_3)) */
- .ieee_getpfc = mlx4_en_dcbnl_ieee_getpfc,
- .ieee_setpfc = mlx4_en_dcbnl_ieee_setpfc,
-
projects / ~emulex / for-vlad / old / compat-rdma.git / commitdiff