From 5a78c9bde37b888ce47287f66461a83cf88ed99c Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Thu, 23 Jan 2014 18:09:26 +0200 Subject: [PATCH] Refreshed backport patches Fixed patches format to support git-am Signed-off-by: Vladimir Sokolovsky --- ...0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch | 11 +-- ...s-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch} | 76 +++++++++++-------- ...s-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch} | 13 +++- ...s-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch} | 60 +++++++++------ ...s-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch} | 26 +++++-- ...date-driver-version-to-reflect-ofed.patch} | 10 ++- ...date-driver-version-to-reflect-ofed.patch} | 10 ++- ...-qib-backport-qib_fs.c-before-2.6.35.patch | 16 ++-- ...path-backport-qib_fs.c-before-2.6.35.patch | 2 +- ...> 0017-Deal-with-struct-pci-changes.patch} | 7 +- ...h => 0018-Work-around-new-idr-style.patch} | 7 +- ...0019-RDMA-nes-3.12-backport-patches.patch} | 16 ++-- 12 files changed, 153 insertions(+), 101 deletions(-) rename patches/{0007-cxgb3-RHEL64-RHEL65-SLES11SP3-backport.patch => 0007-cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch} (88%) rename patches/{0008-iw_cxgb3_RHEL64-RHEL65-SLES11SP3-backport.patch => 0008-iw_cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch} (87%) rename patches/{0009-cxgb4_RHEL64-RHEL65-SLES11SP3-backport.patch => 0009-cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch} (92%) rename patches/{0010-iw_cxgb4_RHEL64-RHEL65-SLES11SP3-backport.patch => 0010-iw_cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch} (87%) rename patches/{0011-cxgb4-update-driver-version.patch => 0011-cxgb4-Update-driver-version-to-reflect-ofed.patch} (57%) rename patches/{0012-cxgb3-update-driver-version.patch => 0012-cxgb3-Update-driver-version-to-reflect-ofed.patch} (59%) rename patches/{0017-IB-qib-backport-3.12-struct-pci-changes.patch => 0017-Deal-with-struct-pci-changes.patch} (93%) rename patches/{0018-IB-qib-backport-before-idr-style-init.patch => 0018-Work-around-new-idr-style.patch} (93%) rename patches/{0019-nes-RHEL64-RHEL65-SLES11SP3-backport.patch => 0019-RDMA-nes-3.12-backport-patches.patch} (97%) diff --git a/patches/0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch b/patches/0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch index f4a6145..d936cee 100644 --- a/patches/0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch +++ b/patches/0006-cxgb3-cxgb4-Fix-pr_fmt-warnings.patch @@ -1,6 +1,4 @@ -From 6e82a8471598de501464ffa6ef2d0847d438c95c Mon Sep 17 00:00:00 2001 From: Kumar Sanghvi -Date: Mon, 16 Dec 2013 13:06:47 +0530 Subject: [PATCH] cxgb3/cxgb4: Fix pr_fmt warnings Signed-off-by: Kumar Sanghvi @@ -11,7 +9,7 @@ Signed-off-by: Kumar Sanghvi 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c -index b650951..a69ebcc 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c @@ -30,6 +30,7 @@ @@ -23,7 +21,7 @@ index b650951..a69ebcc 100644 #include diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c -index 76ae099..a58dd28 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c @@ -30,6 +30,7 @@ @@ -35,7 +33,7 @@ index 76ae099..a58dd28 100644 #include diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -index a9bce6b..4c3c875 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -32,6 +32,7 @@ @@ -46,6 +44,3 @@ index a9bce6b..4c3c875 100644 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include --- -1.7.1 - diff --git a/patches/0007-cxgb3-RHEL64-RHEL65-SLES11SP3-backport.patch b/patches/0007-cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch similarity index 88% rename from patches/0007-cxgb3-RHEL64-RHEL65-SLES11SP3-backport.patch rename to patches/0007-cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch index 196cc91..6aadf9a 100644 --- a/patches/0007-cxgb3-RHEL64-RHEL65-SLES11SP3-backport.patch +++ b/patches/0007-cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch @@ -1,5 +1,21 @@ +From: Kumar Sanghvi +Subject: [PATCH] cxgb3: Backports for RHEL6.4, RHEL6.5 and SLES11sp3 + +Signed-off-by: Kumar Sanghvi +--- + drivers/net/ethernet/chelsio/cxgb3/adapter.h | 19 +++ + drivers/net/ethernet/chelsio/cxgb3/common.h | 3 + + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 118 +++++++++++++++++++- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 107 ++++++++++++++++++- + drivers/net/ethernet/chelsio/cxgb3/l2t.c | 9 ++ + drivers/net/ethernet/chelsio/cxgb3/l2t.h | 5 + + drivers/net/ethernet/chelsio/cxgb3/sge.c | 46 ++++++++ + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 4 + + drivers/net/ethernet/chelsio/cxgb3/xgmac.c | 17 +++- + 9 files changed, 325 insertions(+), 3 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 @@ @@ -49,7 +65,7 @@ index 8b395b5..27bd384 100644 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 8c82248..97bd0a7 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/common.h +++ b/drivers/net/ethernet/chelsio/cxgb3/common.h @@ -316,6 +316,9 @@ struct tp_params { @@ -63,10 +79,10 @@ index 8c82248..97bd0a7 100644 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 b650951..df32cc5 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c -@@ -647,6 +647,28 @@ static void enable_all_napi(struct adapter *adap) +@@ -648,6 +648,28 @@ static void enable_all_napi(struct adapter *adap) napi_enable(&adap->sge.qs[i].napi); } @@ -95,7 +111,7 @@ index b650951..df32cc5 100644 /** * setup_sge_qsets - configure SGE Tx/Rx/response queues * @adap: the adapter -@@ -1174,6 +1196,7 @@ static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p) +@@ -1175,6 +1197,7 @@ static void t3_synchronize_rx(struct adapter *adap, const struct port_info *p) } } @@ -103,7 +119,7 @@ index b650951..df32cc5 100644 static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features) { struct port_info *pi = netdev_priv(dev); -@@ -1195,6 +1218,27 @@ static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features) +@@ -1196,6 +1219,27 @@ static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features) } t3_synchronize_rx(adapter, pi); } @@ -131,7 +147,7 @@ index b650951..df32cc5 100644 /** * cxgb_up - enable the adapter -@@ -1208,7 +1252,10 @@ static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features) +@@ -1209,7 +1253,10 @@ static void cxgb_vlan_mode(struct net_device *dev, netdev_features_t features) */ static int cxgb_up(struct adapter *adap) { @@ -143,7 +159,7 @@ index b650951..df32cc5 100644 if (!(adap->flags & FULL_INIT_DONE)) { err = t3_check_fw_version(adap); -@@ -1245,8 +1292,10 @@ static int cxgb_up(struct adapter *adap) +@@ -1246,8 +1293,10 @@ static int cxgb_up(struct adapter *adap) if (err) goto out; @@ -154,7 +170,7 @@ index b650951..df32cc5 100644 setup_rss(adap); if (!(adap->flags & NAPI_INIT)) -@@ -1775,6 +1824,7 @@ static int restart_autoneg(struct net_device *dev) +@@ -1776,6 +1825,7 @@ static int restart_autoneg(struct net_device *dev) return 0; } @@ -162,7 +178,7 @@ index b650951..df32cc5 100644 static int set_phys_id(struct net_device *dev, enum ethtool_phys_id_state state) { -@@ -1797,6 +1847,28 @@ static int set_phys_id(struct net_device *dev, +@@ -1798,6 +1848,28 @@ static int set_phys_id(struct net_device *dev, return 0; } @@ -191,7 +207,7 @@ index b650951..df32cc5 100644 static int get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { -@@ -2110,7 +2182,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = { +@@ -2111,7 +2183,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .set_pauseparam = set_pauseparam, .get_link = ethtool_op_get_link, .get_strings = get_strings, @@ -203,7 +219,7 @@ index b650951..df32cc5 100644 .nway_reset = restart_autoneg, .get_sset_count = get_sset_count, .get_ethtool_stats = get_stats, -@@ -2225,6 +2301,7 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) +@@ -2226,6 +2302,7 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) } } @@ -211,7 +227,7 @@ index b650951..df32cc5 100644 if (t.lro >= 0) { if (t.lro) dev->wanted_features |= NETIF_F_GRO; -@@ -2232,6 +2309,10 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) +@@ -2233,6 +2310,10 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) dev->wanted_features &= ~NETIF_F_GRO; netdev_update_features(dev); } @@ -222,7 +238,7 @@ index b650951..df32cc5 100644 break; } -@@ -2557,6 +2638,7 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p) +@@ -2558,6 +2639,7 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p) return 0; } @@ -230,7 +246,7 @@ index b650951..df32cc5 100644 static netdev_features_t cxgb_fix_features(struct net_device *dev, netdev_features_t features) { -@@ -2581,6 +2663,7 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features) +@@ -2582,6 +2664,7 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features) return 0; } @@ -238,7 +254,7 @@ index b650951..df32cc5 100644 #ifdef CONFIG_NET_POLL_CONTROLLER static void cxgb_netpoll(struct net_device *dev) -@@ -3042,11 +3125,19 @@ static void t3_io_resume(struct pci_dev *pdev) +@@ -3043,11 +3126,19 @@ static void t3_io_resume(struct pci_dev *pdev) rtnl_unlock(); } @@ -258,7 +274,7 @@ index b650951..df32cc5 100644 /* * Set the number of qsets based on the number of CPUs and the number of ports, -@@ -3162,8 +3253,12 @@ static const struct net_device_ops cxgb_netdev_ops = { +@@ -3163,8 +3254,12 @@ static const struct net_device_ops cxgb_netdev_ops = { .ndo_do_ioctl = cxgb_ioctl, .ndo_change_mtu = cxgb_change_mtu, .ndo_set_mac_address = cxgb_set_mac_addr, @@ -271,7 +287,7 @@ index b650951..df32cc5 100644 #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = cxgb_netpoll, #endif -@@ -3290,14 +3385,35 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -3291,14 +3386,35 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->irq = pdev->irq; netdev->mem_start = mmio_start; netdev->mem_end = mmio_start + mmio_len - 1; @@ -308,10 +324,10 @@ index b650951..df32cc5 100644 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 76ae099..3033d05 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c -@@ -64,8 +64,14 @@ static const unsigned int MAX_ATIDS = 64 * 1024; +@@ -65,8 +65,14 @@ static const unsigned int MAX_ATIDS = 64 * 1024; static const unsigned int ATID_BASE = 0x10000; static void cxgb_neigh_update(struct neighbour *neigh); @@ -327,7 +343,7 @@ index 76ae099..3033d05 100644 static inline int offload_activated(struct t3cdev *tdev) { -@@ -180,18 +186,36 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter, +@@ -181,18 +187,36 @@ static struct net_device *get_iff_from_mac(struct adapter *adapter, int i; for_each_port(adapter, i) { @@ -364,7 +380,7 @@ index 76ae099..3033d05 100644 } rcu_read_unlock(); return dev; -@@ -969,9 +993,14 @@ static int nb_callback(struct notifier_block *self, unsigned long event, +@@ -970,9 +994,14 @@ static int nb_callback(struct notifier_block *self, unsigned long event, } case (NETEVENT_REDIRECT):{ struct netevent_redirect *nr = ctx; @@ -379,7 +395,7 @@ index 76ae099..3033d05 100644 break; } default: -@@ -1107,6 +1136,7 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e) +@@ -1108,6 +1137,7 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e) tdev->send(tdev, skb); } @@ -387,7 +403,7 @@ index 76ae099..3033d05 100644 static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new, struct neighbour *neigh, const void *daddr) -@@ -1127,7 +1157,11 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new, +@@ -1128,7 +1158,11 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new, BUG_ON(!tdev); /* Add new L2T entry */ @@ -399,7 +415,7 @@ index 76ae099..3033d05 100644 if (!e) { pr_err("%s: couldn't allocate new l2t entry!\n", __func__); return; -@@ -1150,6 +1184,77 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new, +@@ -1151,6 +1185,77 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new, } l2t_release(tdev, e); } @@ -478,7 +494,7 @@ index 76ae099..3033d05 100644 /* * Allocate a chunk of memory using kmalloc or, if that fails, vmalloc. diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.c b/drivers/net/ethernet/chelsio/cxgb3/l2t.c -index 8d53438..ea9bd19 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.c +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.c @@ -298,8 +298,13 @@ static inline void reuse_entry(struct l2t_entry *e, struct neighbour *neigh) @@ -508,7 +524,7 @@ index 8d53438..ea9bd19 100644 goto done_rcu; diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h -index 8cffcdf..1db5a71 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h @@ -109,8 +109,13 @@ static inline void set_arp_failure_handler(struct sk_buff *skb, @@ -526,7 +542,7 @@ index 8cffcdf..1db5a71 100644 struct l2t_entry *e); void t3_l2t_send_event(struct t3cdev *dev, struct l2t_entry *e); diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c -index 9c89dc8..9414ae0 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c @@ -2019,7 +2019,11 @@ static void rx_eth(struct adapter *adap, struct sge_rspq *rq, @@ -615,7 +631,7 @@ index 9c89dc8..9414ae0 100644 } diff --git a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c -index c74a898..83103f0 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb3/t3_hw.c @@ -3307,7 +3307,11 @@ static void config_pcie(struct adapter *adap) @@ -631,7 +647,7 @@ index c74a898..83103f0 100644 rpllmt = rpl_tmr[log2_width][pldsize] + fst_trn_rx * 4; 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) diff --git a/patches/0008-iw_cxgb3_RHEL64-RHEL65-SLES11SP3-backport.patch b/patches/0008-iw_cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch similarity index 87% rename from patches/0008-iw_cxgb3_RHEL64-RHEL65-SLES11SP3-backport.patch rename to patches/0008-iw_cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch index 2628f13..9da5869 100644 --- a/patches/0008-iw_cxgb3_RHEL64-RHEL65-SLES11SP3-backport.patch +++ b/patches/0008-iw_cxgb3-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch @@ -1,5 +1,14 @@ +From: Kumar Sanghvi +Subject: [PATCH] iw_cxgb3: Backports for RHEL6.4, RHEL6.5 and SLES11sp3 + +Signed-off-by: Kumar Sanghvi +--- + drivers/infiniband/hw/cxgb3/iwch.h | 17 +++++++++++++- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 39 +++++++++++++++++++++++++++++++++ + 2 files changed, 55 insertions(+), 1 deletions(-) + diff --git a/drivers/infiniband/hw/cxgb3/iwch.h b/drivers/infiniband/hw/cxgb3/iwch.h -index 8378622..470527f 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/cxgb3/iwch.h +++ b/drivers/infiniband/hw/cxgb3/iwch.h @@ -153,7 +153,7 @@ static inline int insert_handle(struct iwch_dev *rhp, struct idr *idr, @@ -34,7 +43,7 @@ index 8378622..470527f 100644 static inline void remove_handle(struct iwch_dev *rhp, struct idr *idr, u32 id) diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c -index 095bb04..320ea47 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/cxgb3/iwch_cm.c +++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c @@ -337,12 +337,33 @@ static struct rtable *find_route(struct t3cdev *dev, __be32 local_ip, diff --git a/patches/0009-cxgb4_RHEL64-RHEL65-SLES11SP3-backport.patch b/patches/0009-cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch similarity index 92% rename from patches/0009-cxgb4_RHEL64-RHEL65-SLES11SP3-backport.patch rename to patches/0009-cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch index 2fe0fe7..8cf45f0 100644 --- a/patches/0009-cxgb4_RHEL64-RHEL65-SLES11SP3-backport.patch +++ b/patches/0009-cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch @@ -1,8 +1,18 @@ +From: Kumar Sanghvi +Subject: [PATCH] cxgb4: Backports for RHEL6.4, RHEL6.5 and SLES11sp3 + +Signed-off-by: Kumar Sanghvi +--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 17 ++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 208 ++++++++++++++++++++--- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 108 ++++++++++++ + 3 files changed, 308 insertions(+), 25 deletions(-) + diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h -index 6154404..ad01c8b 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h -@@ -367,6 +367,9 @@ struct sge_rspq; +@@ -309,6 +309,9 @@ struct sge_rspq; struct port_info { struct adapter *adapter; @@ -12,7 +22,7 @@ index 6154404..ad01c8b 100644 u16 viid; s16 xact_addr_filt; /* index of exact MAC address filter */ u16 rss_size; /* size of VI's RSS table slice */ -@@ -376,6 +379,9 @@ struct port_info { +@@ -318,6 +321,9 @@ struct port_info { u8 port_id; u8 tx_chan; u8 lport; /* associated offload logical port */ @@ -22,7 +32,7 @@ index 6154404..ad01c8b 100644 u8 nqsets; /* # of qsets */ u8 first_qset; /* index of first qset */ u8 rss_mode; -@@ -383,6 +389,13 @@ struct port_info { +@@ -325,6 +331,13 @@ struct port_info { u16 *rss; }; @@ -36,7 +46,7 @@ index 6154404..ad01c8b 100644 struct dentry; struct work_struct; -@@ -417,7 +430,11 @@ struct sge_fl { /* SGE free-buffer queue state */ +@@ -359,7 +372,11 @@ struct sge_fl { /* SGE free-buffer queue state */ /* A packet gather list */ struct pkt_gl { @@ -49,7 +59,7 @@ index 6154404..ad01c8b 100644 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 4c3c875..846cc48 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -70,8 +70,6 @@ @@ -103,7 +113,7 @@ index 4c3c875..846cc48 100644 ret = t4_alloc_mac_filt(pi->adapter, mb, pi->viid, free, naddr, addr, filt_idx, &mhash, sleep); if (ret < 0) -@@ -2682,10 +2697,19 @@ static int set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) +@@ -2748,10 +2763,19 @@ static int set_wol(struct net_device *dev, struct ethtool_wolinfo *wol) return err; } @@ -123,7 +133,7 @@ index 4c3c875..846cc48 100644 int err; if (!(changed & NETIF_F_HW_VLAN_CTAG_RX)) -@@ -2698,14 +2722,55 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features) +@@ -2764,14 +2788,55 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features) dev->features = features ^ NETIF_F_HW_VLAN_CTAG_RX; return err; } @@ -179,7 +189,7 @@ index 4c3c875..846cc48 100644 static int get_rss_table(struct net_device *dev, u32 *p) { const struct port_info *pi = netdev_priv(dev); -@@ -2727,9 +2792,14 @@ static int set_rss_table(struct net_device *dev, const u32 *p) +@@ -2793,9 +2858,14 @@ static int set_rss_table(struct net_device *dev, const u32 *p) return write_rss(pi, pi->rss); return 0; } @@ -194,7 +204,7 @@ index 4c3c875..846cc48 100644 { const struct port_info *pi = netdev_priv(dev); -@@ -2808,7 +2878,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = { +@@ -2874,7 +2944,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .set_pauseparam = set_pauseparam, .get_link = ethtool_op_get_link, .get_strings = get_strings, @@ -206,7 +216,7 @@ index 4c3c875..846cc48 100644 .nway_reset = restart_autoneg, .get_sset_count = get_sset_count, .get_ethtool_stats = get_stats, -@@ -2816,10 +2890,18 @@ static const struct ethtool_ops cxgb_ethtool_ops = { +@@ -2882,10 +2956,18 @@ static const struct ethtool_ops cxgb_ethtool_ops = { .get_regs = get_regs, .get_wol = get_wol, .set_wol = set_wol, @@ -225,7 +235,7 @@ index 4c3c875..846cc48 100644 .flash_device = set_flash, }; -@@ -2830,7 +2912,11 @@ static ssize_t mem_read(struct file *file, char __user *buf, size_t count, +@@ -2896,7 +2978,11 @@ static ssize_t mem_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { loff_t pos = *ppos; @@ -237,7 +247,7 @@ index 4c3c875..846cc48 100644 unsigned int mem = (uintptr_t)file->private_data & 3; struct adapter *adap = file->private_data - mem; -@@ -3947,33 +4033,10 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, +@@ -3983,33 +4069,10 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this, struct inet6_ifaddr *ifa = data; struct net_device *event_dev; int ret = NOTIFY_DONE; @@ -271,7 +281,7 @@ index 4c3c875..846cc48 100644 } else ret = clip_add(ifa->idev->dev, ifa, event); -@@ -3999,7 +4062,11 @@ static int update_dev_clip(struct net_device *root_dev, struct net_device *dev) +@@ -4035,7 +4098,11 @@ static int update_dev_clip(struct net_device *root_dev, struct net_device *dev) return ret; read_lock_bh(&idev->lock); @@ -283,7 +293,7 @@ index 4c3c875..846cc48 100644 ret = cxgb4_clip_get(dev, (const struct in6_addr *)ifa->addr.s6_addr); if (ret < 0) -@@ -4013,6 +4080,10 @@ static int update_dev_clip(struct net_device *root_dev, struct net_device *dev) +@@ -4049,6 +4116,10 @@ static int update_dev_clip(struct net_device *root_dev, struct net_device *dev) static int update_root_dev_clip(struct net_device *dev) { struct net_device *root_dev = NULL; @@ -294,7 +304,7 @@ index 4c3c875..846cc48 100644 int i, ret = 0; /* First populate the real net device's IPv6 addresses */ -@@ -4022,7 +4093,13 @@ static int update_root_dev_clip(struct net_device *dev) +@@ -4058,7 +4129,13 @@ static int update_root_dev_clip(struct net_device *dev) /* Parse all bond and vlan devices layered on top of the physical dev */ for (i = 0; i < VLAN_N_VID; i++) { @@ -308,7 +318,7 @@ index 4c3c875..846cc48 100644 if (!root_dev) continue; -@@ -4287,6 +4364,7 @@ int cxgb4_remove_server_filter(const struct net_device *dev, unsigned int stid, +@@ -4318,6 +4395,7 @@ int cxgb4_remove_server_filter(const struct net_device *dev, unsigned int stid, } EXPORT_SYMBOL(cxgb4_remove_server_filter); @@ -316,7 +326,7 @@ index 4c3c875..846cc48 100644 static struct rtnl_link_stats64 *cxgb_get_stats(struct net_device *dev, struct rtnl_link_stats64 *ns) { -@@ -4328,6 +4406,50 @@ static struct rtnl_link_stats64 *cxgb_get_stats(struct net_device *dev, +@@ -4359,6 +4437,50 @@ static struct rtnl_link_stats64 *cxgb_get_stats(struct net_device *dev, ns->rx_length_errors + stats.rx_len_err + ns->rx_fifo_errors; return ns; } @@ -367,7 +377,7 @@ index 4c3c875..846cc48 100644 static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd) { -@@ -4428,10 +4550,16 @@ static const struct net_device_ops cxgb4_netdev_ops = { +@@ -4459,10 +4581,16 @@ static const struct net_device_ops cxgb4_netdev_ops = { .ndo_open = cxgb_open, .ndo_stop = cxgb_close, .ndo_start_xmit = t4_eth_xmit, @@ -384,7 +394,7 @@ index 4c3c875..846cc48 100644 .ndo_validate_addr = eth_validate_addr, .ndo_do_ioctl = cxgb_ioctl, .ndo_change_mtu = cxgb_change_mtu, -@@ -5586,11 +5714,19 @@ static void eeh_resume(struct pci_dev *pdev) +@@ -5555,11 +5683,19 @@ static void eeh_resume(struct pci_dev *pdev) rtnl_unlock(); } @@ -404,7 +414,7 @@ index 4c3c875..846cc48 100644 static inline bool is_10g_port(const struct link_config *lc) { -@@ -5783,7 +5919,11 @@ static int init_rss(struct adapter *adap) +@@ -5752,7 +5888,11 @@ static int init_rss(struct adapter *adap) if (!pi->rss) return -ENOMEM; for (j = 0; j < pi->rss_size; j++) @@ -416,7 +426,7 @@ index 4c3c875..846cc48 100644 } return 0; } -@@ -5855,7 +5995,9 @@ static void free_some_resources(struct adapter *adapter) +@@ -5824,7 +5964,9 @@ static void free_some_resources(struct adapter *adapter) t4_fw_bye(adapter, adapter->fn); } @@ -426,7 +436,7 @@ index 4c3c875..846cc48 100644 #define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \ NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA) #define SEGMENT_SIZE 128 -@@ -5989,19 +6131,35 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -5958,19 +6100,35 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) pi = netdev_priv(netdev); pi->adapter = adapter; pi->xact_addr_filt = -1; @@ -463,7 +473,7 @@ index 4c3c875..846cc48 100644 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 cc380c3..ae3f8aa 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c @@ -68,6 +68,11 @@ @@ -613,7 +623,7 @@ index cc380c3..ae3f8aa 100644 ret = napi_gro_frags(&rxq->rspq.napi); @@ -1663,6 +1728,9 @@ int t4_ethrx_handler(struct sge_rspq *q, const __be64 *rsp, struct sge *s = &q->adap->sge; - int cpl_trace_pkt = is_t4(q->adap->params.chip) ? + int cpl_trace_pkt = is_t4(q->adap->chip) ? CPL_TRACE_PKT : CPL_TRACE_PKT_T5; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) + struct port_info *pi; diff --git a/patches/0010-iw_cxgb4_RHEL64-RHEL65-SLES11SP3-backport.patch b/patches/0010-iw_cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch similarity index 87% rename from patches/0010-iw_cxgb4_RHEL64-RHEL65-SLES11SP3-backport.patch rename to patches/0010-iw_cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch index 1ea60b4..e4a7541 100644 --- a/patches/0010-iw_cxgb4_RHEL64-RHEL65-SLES11SP3-backport.patch +++ b/patches/0010-iw_cxgb4-Backports-for-RHEL6.4-RHEL6.5-and-SLES11sp3.patch @@ -1,5 +1,15 @@ +From: Kumar Sanghvi +Subject: [PATCH] iw_cxgb4: Backports for RHEL6.4, RHEL6.5 and SLES11sp3 + +Signed-off-by: Kumar Sanghvi +--- + drivers/infiniband/hw/cxgb4/cm.c | 79 ++++++++++++++++++++++++++++++++ + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 17 +++++++ + drivers/infiniband/hw/cxgb4/mem.c | 1 + + 3 files changed, 97 insertions(+), 0 deletions(-) + diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c -index 4512687..5a1bf82 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c @@ -363,6 +363,7 @@ static struct dst_entry *find_route6(struct c4iw_dev *dev, __u8 *local_ip, @@ -84,7 +94,7 @@ index 4512687..5a1bf82 100644 } static void arp_failure_discard(void *handle, struct sk_buff *skb) -@@ -1657,11 +1703,22 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, +@@ -1696,11 +1742,22 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, int err, step; struct net_device *pdev; @@ -107,7 +117,7 @@ index 4512687..5a1bf82 100644 err = -ENOMEM; if (n->dev->flags & IFF_LOOPBACK) { if (iptype == 4) -@@ -1723,7 +1780,9 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, +@@ -1762,7 +1819,9 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, out: rcu_read_unlock(); @@ -117,7 +127,7 @@ index 4512687..5a1bf82 100644 return err; } -@@ -2649,7 +2708,11 @@ static int get_lladdr(struct net_device *dev, struct in6_addr *addr, +@@ -2688,7 +2747,11 @@ static int get_lladdr(struct net_device *dev, struct in6_addr *addr, struct inet6_ifaddr *ifp; read_lock_bh(&idev->lock); @@ -129,7 +139,7 @@ index 4512687..5a1bf82 100644 if (ifp->scope == IFA_LINK && !(ifp->flags & banned_flags)) { memcpy(addr, &ifp->addr, 16); -@@ -3162,7 +3225,15 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos) +@@ -3200,7 +3263,15 @@ static void build_cpl_pass_accept_req(struct sk_buff *skb, int stid , u8 tos) */ memset(&tmp_opt, 0, sizeof(tmp_opt)); tcp_clear_options(&tmp_opt); @@ -145,7 +155,7 @@ index 4512687..5a1bf82 100644 req = (struct cpl_pass_accept_req *)__skb_push(skb, sizeof(*req)); memset(req, 0, sizeof(*req)); -@@ -3324,7 +3395,15 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb) +@@ -3364,7 +3435,15 @@ static int rx_pkt(struct c4iw_dev *dev, struct sk_buff *skb) __func__); goto reject; } @@ -162,7 +172,7 @@ index 4512687..5a1bf82 100644 if (!neigh) { pr_err("%s - failed to allocate neigh!\n", diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h -index 23eaeab..8fb094c 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h @@ -261,6 +261,7 @@ static inline int _insert_handle(struct c4iw_dev *rhp, struct idr *idr, @@ -197,7 +207,7 @@ index 23eaeab..8fb094c 100644 static inline int insert_handle(struct c4iw_dev *rhp, struct idr *idr, diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c -index 4cb8eb2..0804aca 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/cxgb4/mem.c +++ b/drivers/infiniband/hw/cxgb4/mem.c @@ -34,6 +34,7 @@ diff --git a/patches/0011-cxgb4-update-driver-version.patch b/patches/0011-cxgb4-Update-driver-version-to-reflect-ofed.patch similarity index 57% rename from patches/0011-cxgb4-update-driver-version.patch rename to patches/0011-cxgb4-Update-driver-version-to-reflect-ofed.patch index 1ed21d2..56edfe7 100644 --- a/patches/0011-cxgb4-update-driver-version.patch +++ b/patches/0011-cxgb4-Update-driver-version-to-reflect-ofed.patch @@ -1,5 +1,13 @@ +From: Kumar Sanghvi +Subject: [PATCH] cxgb4: Update driver version to reflect ofed + +Signed-off-by: Kumar Sanghvi +--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -index 94a6e62..99f43a6 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -73,7 +73,7 @@ diff --git a/patches/0012-cxgb3-update-driver-version.patch b/patches/0012-cxgb3-Update-driver-version-to-reflect-ofed.patch similarity index 59% rename from patches/0012-cxgb3-update-driver-version.patch rename to patches/0012-cxgb3-Update-driver-version-to-reflect-ofed.patch index f4aacb5..72f3ebc 100644 --- a/patches/0012-cxgb3-update-driver-version.patch +++ b/patches/0012-cxgb3-Update-driver-version-to-reflect-ofed.patch @@ -1,5 +1,13 @@ +From: Kumar Sanghvi +Subject: [PATCH] cxgb3: Update driver version to reflect ofed + +Signed-off-by: Kumar Sanghvi +--- + drivers/net/ethernet/chelsio/cxgb3/version.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + diff --git a/drivers/net/ethernet/chelsio/cxgb3/version.h b/drivers/net/ethernet/chelsio/cxgb3/version.h -index 165bfb9..1cfffe2 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/net/ethernet/chelsio/cxgb3/version.h +++ b/drivers/net/ethernet/chelsio/cxgb3/version.h @@ -35,7 +35,7 @@ diff --git a/patches/0013-IB-qib-backport-qib_fs.c-before-2.6.35.patch b/patches/0013-IB-qib-backport-qib_fs.c-before-2.6.35.patch index 2bab478..a71d90f 100644 --- a/patches/0013-IB-qib-backport-qib_fs.c-before-2.6.35.patch +++ b/patches/0013-IB-qib-backport-qib_fs.c-before-2.6.35.patch @@ -10,7 +10,7 @@ diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_ 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, +@@ -59,7 +59,9 @@ static int qibfs_mknod(struct inode *dir, struct dentry *dentry, goto bail; } @@ -18,9 +18,9 @@ index xxxxxxx..xxxxxxx xxxxxx inode->i_ino = get_next_ino(); +#endif inode->i_mode = mode; - inode->i_uid = 0; - inode->i_gid = 0; -@@ -453,14 +455,27 @@ static int remove_file(struct dentry *parent, char *name) + inode->i_uid = GLOBAL_ROOT_UID; + inode->i_gid = GLOBAL_ROOT_GID; +@@ -454,14 +456,27 @@ static int remove_file(struct dentry *parent, char *name) goto bail; } @@ -48,7 +48,7 @@ index xxxxxxx..xxxxxxx xxxxxx } ret = 0; -@@ -552,6 +567,7 @@ bail: +@@ -553,6 +568,7 @@ bail: return ret; } @@ -56,7 +56,7 @@ index xxxxxxx..xxxxxxx xxxxxx static struct dentry *qibfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { -@@ -559,6 +575,15 @@ static struct dentry *qibfs_mount(struct file_system_type *fs_type, int flags, +@@ -560,6 +576,15 @@ static struct dentry *qibfs_mount(struct file_system_type *fs_type, int flags, ret = mount_single(fs_type, flags, data, qibfs_fill_super); if (!IS_ERR(ret)) qib_super = ret->d_sb; @@ -72,7 +72,7 @@ index xxxxxxx..xxxxxxx xxxxxx return ret; } -@@ -600,7 +625,11 @@ int qibfs_remove(struct qib_devdata *dd) +@@ -601,7 +626,11 @@ int qibfs_remove(struct qib_devdata *dd) static struct file_system_type qibfs_fs_type = { .owner = THIS_MODULE, .name = "ipathfs", @@ -83,4 +83,4 @@ index xxxxxxx..xxxxxxx xxxxxx +#endif .kill_sb = qibfs_kill_super, }; - + MODULE_ALIAS_FS("ipathfs"); diff --git a/patches/0015-IB-ipath-backport-qib_fs.c-before-2.6.35.patch b/patches/0015-IB-ipath-backport-qib_fs.c-before-2.6.35.patch index b751b78..f27a3aa 100644 --- a/patches/0015-IB-ipath-backport-qib_fs.c-before-2.6.35.patch +++ b/patches/0015-IB-ipath-backport-qib_fs.c-before-2.6.35.patch @@ -77,4 +77,4 @@ index xxxxxxx..xxxxxxx xxxxxx +#endif .kill_sb = ipathfs_kill_super, }; - + MODULE_ALIAS_FS("ipathfs"); diff --git a/patches/0017-IB-qib-backport-3.12-struct-pci-changes.patch b/patches/0017-Deal-with-struct-pci-changes.patch similarity index 93% rename from patches/0017-IB-qib-backport-3.12-struct-pci-changes.patch rename to patches/0017-Deal-with-struct-pci-changes.patch index 13bdf33..c6fc73c 100644 --- a/patches/0017-IB-qib-backport-3.12-struct-pci-changes.patch +++ b/patches/0017-Deal-with-struct-pci-changes.patch @@ -1,14 +1,13 @@ -Deal with struct pci changes. - From: Dennis Dalessandro +Subject: [PATCH] Deal with struct pci changes. - +Signed-off-by: Dennis Dalessandro --- drivers/infiniband/hw/qib/qib_pcie.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c -index 3f14009..340845c 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/qib/qib_pcie.c +++ b/drivers/infiniband/hw/qib/qib_pcie.c @@ -283,12 +283,20 @@ int qib_pcie_params(struct qib_devdata *dd, u32 minw, u32 *nent, diff --git a/patches/0018-IB-qib-backport-before-idr-style-init.patch b/patches/0018-Work-around-new-idr-style.patch similarity index 93% rename from patches/0018-IB-qib-backport-before-idr-style-init.patch rename to patches/0018-Work-around-new-idr-style.patch index 3d422b3..4b1f97f 100644 --- a/patches/0018-IB-qib-backport-before-idr-style-init.patch +++ b/patches/0018-Work-around-new-idr-style.patch @@ -1,14 +1,13 @@ -Work around new idr style - From: Dennis Dalessandro +Subject: [PATCH] Work around new idr style - +Signed-off-by: Dennis Dalessandro --- drivers/infiniband/hw/qib/qib_init.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c -index 24e802f..6dcb460 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/qib/qib_init.c +++ b/drivers/infiniband/hw/qib/qib_init.c @@ -1096,6 +1096,12 @@ struct qib_devdata *qib_alloc_devdata(struct pci_dev *pdev, size_t extra) diff --git a/patches/0019-nes-RHEL64-RHEL65-SLES11SP3-backport.patch b/patches/0019-RDMA-nes-3.12-backport-patches.patch similarity index 97% rename from patches/0019-nes-RHEL64-RHEL65-SLES11SP3-backport.patch rename to patches/0019-RDMA-nes-3.12-backport-patches.patch index 44d9126..6bc566e 100644 --- a/patches/0019-nes-RHEL64-RHEL65-SLES11SP3-backport.patch +++ b/patches/0019-RDMA-nes-3.12-backport-patches.patch @@ -1,4 +1,5 @@ -RDMA/nes: Backport patch for RHEL6.4, RHEL6.5 and SLES11 SP3 +From: Tatyana Nikolova +Subject: [PATCH] RDMA/nes: 3.12 backport patches Signed-off-by: Tatyana Nikolova --- @@ -10,7 +11,7 @@ Signed-off-by: Tatyana Nikolova 5 files changed, 137 insertions(+), 11 deletions(-) diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c -index 4291410..570b0f5 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c @@ -146,7 +146,11 @@ static int nes_inetaddr_event(struct notifier_block *notifier, @@ -26,7 +27,7 @@ index 4291410..570b0f5 100644 (upper_dev == event_netdev); if ((netdev == event_netdev) || is_bonded) { diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c -index 6b29249..18c3162 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c @@ -1331,16 +1331,28 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip, int arpi @@ -60,7 +61,7 @@ index 6b29249..18c3162 100644 netdev = nesvnic->netdev; diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c -index 9020024..86afebb 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c @@ -2909,7 +2909,11 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq) @@ -116,7 +117,7 @@ index 9020024..86afebb 100644 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..72e5934 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/nes/nes_hw.h +++ b/drivers/infiniband/hw/nes/nes_hw.h @@ -1269,6 +1269,12 @@ struct nes_vnic { @@ -133,7 +134,7 @@ index d748e4b..72e5934 100644 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 49eb511..795d305 100644 +index xxxxxxx..xxxxxxx xxxxxx --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c @@ -904,16 +904,24 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev) @@ -295,6 +296,3 @@ index 49eb511..795d305 100644 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.1 - -- 2.46.0