From ae9dba6b27273d24845feabea9eced7f1d7dc60c Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Thu, 25 Jul 2013 19:53:29 +0300 Subject: [PATCH] cxgb4/cm: Fix compilation on SLES11.3 Signed-off-by: Vladimir Sokolovsky --- ...cxgb4-cm-Fix-compilation-on-SLES11.3.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 linux-next-pending/0036-cxgb4-cm-Fix-compilation-on-SLES11.3.patch diff --git a/linux-next-pending/0036-cxgb4-cm-Fix-compilation-on-SLES11.3.patch b/linux-next-pending/0036-cxgb4-cm-Fix-compilation-on-SLES11.3.patch new file mode 100644 index 0000000..c8cadcf --- /dev/null +++ b/linux-next-pending/0036-cxgb4-cm-Fix-compilation-on-SLES11.3.patch @@ -0,0 +1,35 @@ +From 13a3b85af5ae8e6dce4fb988f7b43839a867be3a Mon Sep 17 00:00:00 2001 +From: Vladimir Sokolovsky +Date: Thu, 25 Jul 2013 19:50:07 +0300 +Subject: [PATCH] cxgb4/cm: Fix compilation on SLES11.3 + +Signed-off-by: Vladimir Sokolovsky +--- + drivers/infiniband/hw/cxgb4/cm.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c +index 2271a7f..7a9e75f 100644 +--- a/drivers/infiniband/hw/cxgb4/cm.c ++++ b/drivers/infiniband/hw/cxgb4/cm.c +@@ -1601,6 +1601,8 @@ static int c4iw_reconnect(struct c4iw_ep *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, struct sk_buff *skb) + 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 +-- +1.7.9.5 + -- 2.46.0