From: Selvin Xavier Date: Thu, 28 May 2015 13:53:24 +0000 (-0700) Subject: be2net: Fixing the build failure for SLES11 SP4 X-Git-Tag: vofed-3.18~6^2~1^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=98ccbf354d5bbe04aeb7b26c418a3e39f02bb463;p=~tnikolova%2Fcompat-rdma%2F.git be2net: Fixing the build failure for SLES11 SP4 Signed-off-by: Selvin Xavier --- diff --git a/patches/0036-be2net-Fix-build-failure-for-SLES11-SP4.patch b/patches/0036-be2net-Fix-build-failure-for-SLES11-SP4.patch new file mode 100755 index 0000000..1bd1e3d --- /dev/null +++ b/patches/0036-be2net-Fix-build-failure-for-SLES11-SP4.patch @@ -0,0 +1,35 @@ +From 1781822efb6d7dfe2a24315bec5ea75dad0ef858 Mon Sep 17 00:00:00 2001 +From: Mitesh Ahuja +Date: Tue, 26 May 2015 21:57:34 +0530 +Subject: [PATCH] be2net: Fix build failure for SLES11 SP4 + +Fixing compilation issues for SLES11 SP4. + +Signed-off-by: Mitesh Ahuja +Signed-off-by: Selvin Xavier +--- + drivers/net/ethernet/emulex/benet/be_main.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c +index db5711b..f5d6672 100644 +--- a/drivers/net/ethernet/emulex/benet/be_main.c ++++ b/drivers/net/ethernet/emulex/benet/be_main.c +@@ -4721,12 +4721,14 @@ static void be_netdev_init(struct net_device *netdev) + struct be_adapter *adapter = netdev_priv(netdev); + + if (skyhawk_chip(adapter)) { ++#ifdef CONFIG_BE2NET_VXLAN + #ifdef HAVE_NETDEV_HW_ENC_FEATURES + netdev->hw_enc_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | + NETIF_F_TSO | NETIF_F_TSO6 | + NETIF_F_GSO_UDP_TUNNEL; + netdev->hw_features |= NETIF_F_GSO_UDP_TUNNEL; + #endif ++#endif + } + netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 | + NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | +-- +1.7.1 +