From e68f563609e973b12bd2a060e48abd0f6acd64d2 Mon Sep 17 00:00:00 2001 From: Steve Wise Date: Mon, 7 Nov 2016 13:56:49 -0800 Subject: [PATCH] cxgb: Add "-ofed" tag to drivers Signed-off-by: Steve Wise --- patches/0005-BACKPORT-cxgb3.patch | 20 +++++++++++++++++--- patches/0006-BACKPORT-cxgb4.patch | 19 ++++++++++++++----- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/patches/0005-BACKPORT-cxgb3.patch b/patches/0005-BACKPORT-cxgb3.patch index 7af2b9b..c547544 100644 --- a/patches/0005-BACKPORT-cxgb3.patch +++ b/patches/0005-BACKPORT-cxgb3.patch @@ -1,4 +1,4 @@ -From 0ce1cc8e6850f043d06f819511a7a1b140b08825 Mon Sep 17 00:00:00 2001 +From c7cc99288411bf76cfe3bb076b0c2eca1c689d23 Mon Sep 17 00:00:00 2001 From: Steve Wise Date: Tue, 11 Oct 2016 13:57:22 -0700 Subject: [PATCH] BACKPORT: cxgb3 @@ -8,7 +8,8 @@ Signed-off-by: Steve Wise drivers/infiniband/hw/cxgb3/Makefile | 2 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 3 +++ drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 18 ++++++++++++++++++ - 3 files changed, 22 insertions(+), 1 deletion(-) + drivers/net/ethernet/chelsio/cxgb3/version.h | 2 +- + 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/hw/cxgb3/Makefile b/drivers/infiniband/hw/cxgb3/Makefile index 2761364..c780a7a 100644 @@ -71,6 +72,19 @@ index 76684dc..53392bd 100644 } else if (netif_is_bond_slave(dev)) { struct net_device *upper_dev; +diff --git a/drivers/net/ethernet/chelsio/cxgb3/version.h b/drivers/net/ethernet/chelsio/cxgb3/version.h +index 165bfb9..1cfffe2 100644 +--- a/drivers/net/ethernet/chelsio/cxgb3/version.h ++++ b/drivers/net/ethernet/chelsio/cxgb3/version.h +@@ -35,7 +35,7 @@ + #define DRV_DESC "Chelsio T3 Network Driver" + #define DRV_NAME "cxgb3" + /* Driver version */ +-#define DRV_VERSION "1.1.5-ko" ++#define DRV_VERSION "1.1.5-ofed" + + /* Firmware version */ + #define FW_VERSION_MAJOR 7 -- -1.8.3.1 +2.10.2 diff --git a/patches/0006-BACKPORT-cxgb4.patch b/patches/0006-BACKPORT-cxgb4.patch index f4e92b7..a60aec4 100644 --- a/patches/0006-BACKPORT-cxgb4.patch +++ b/patches/0006-BACKPORT-cxgb4.patch @@ -1,4 +1,4 @@ -From 614b6bf4644aac10a87a91f588220f8ba32231d0 Mon Sep 17 00:00:00 2001 +From 3737efd52aefe51ac6650db18698c3083b22eac0 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 11 Oct 2016 15:55:07 -0700 Subject: [PATCH] BACKPORT: cxgb4 @@ -9,9 +9,9 @@ Signed-off-by: Steve Wise drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 19 ++ drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 15 +- drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 232 ++++++++++++++++++++- - drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 21 ++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 23 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 3 +- - 6 files changed, 286 insertions(+), 6 deletions(-) + 6 files changed, 287 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/hw/cxgb4/Makefile b/drivers/infiniband/hw/cxgb4/Makefile index e11cf72..2f9fbf3 100644 @@ -377,7 +377,7 @@ index 02f80fe..194c50b 100644 .get_msglevel = get_msglevel, .set_msglevel = set_msglevel, diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c -index 3ceafb5..336129e 100644 +index 3ceafb5..1a4cc34 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -32,6 +32,9 @@ @@ -390,6 +390,15 @@ index 3ceafb5..336129e 100644 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include +@@ -82,7 +85,7 @@ char cxgb4_driver_name[] = KBUILD_MODNAME; + #ifdef DRV_VERSION + #undef DRV_VERSION + #endif +-#define DRV_VERSION "2.0.0-ko" ++#define DRV_VERSION "2.0.0-ofed" + const char cxgb4_driver_version[] = DRV_VERSION; + #define DRV_DESC "Chelsio T4/T5/T6 Network Driver" + @@ -1342,8 +1345,17 @@ static int del_filter_wr(struct adapter *adapter, int fidx) return 0; } @@ -456,5 +465,5 @@ index 660204b..3dd5302 100644 * it at 0. */ -- -1.8.3.1 +2.10.2 -- 2.41.0