commit ad03dde9e07ae643cb2524475fa15fa0d8e225cd
author Linux Build Service Account <lnxbuild@localhost> Thu Jun 18 03:10:31 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jun 18 03:10:31 2020 -0700
tree 578d2eee0c4402a4d02c93bef78697e222a5ede3
parent 6882c0b04d757c3b6eaf46a8e02ed1e964011755
parent 8325047dfe0fa7a7344a02d8df83401eb3dcc993

Merge "[qca-nss-clients] Fix BONDING_SUPPORT flag issue"

bridge/Makefile

diff --git a/bridge/Makefile b/bridge/Makefile
index f9e445e..12f09c8 100644
--- a/bridge/Makefile
+++ b/bridge/Makefile
@@ -15,7 +15,7 @@
 ccflags-y += -DNSS_BRIDGE_MGR_PPE_SUPPORT
 endif
 
-ifeq ($(CONFIG_BONDING), $(filter $(CONFIG_BONDING), y m))
+ifneq (,$(filter $(CONFIG_BONDING),y m))
 ifneq ($(findstring 4.4, $(KERNELVERSION)),)
 ccflags-y += -DBONDING_SUPPORT
 endif

pppoe/Makefile

diff --git a/pppoe/Makefile b/pppoe/Makefile
index 05e8749..1a2d899 100644
--- a/pppoe/Makefile
+++ b/pppoe/Makefile
@@ -5,7 +5,7 @@
 obj-m += qca-nss-pppoe.o
 qca-nss-pppoe-objs := nss_connmgr_pppoe.o
 
-ifeq ($(CONFIG_BONDING), $(filter $(CONFIG_BONDING), y m))
+ifneq (,$(filter $(CONFIG_BONDING),y m))
 ifneq ($(findstring 4.4, $(KERNELVERSION)),)
 ccflags-y += -DBONDING_SUPPORT
 endif

vlan/Makefile

diff --git a/vlan/Makefile b/vlan/Makefile
index e623c82..ff2ac99 100644
--- a/vlan/Makefile
+++ b/vlan/Makefile
@@ -11,7 +11,7 @@
 ccflags-y += -DNSS_VLAN_MGR_DEBUG_LEVEL=0
 ccflags-y += -Werror
 
-ifeq ($(CONFIG_BONDING), $(filter $(CONFIG_BONDING), y m))
+ifneq (,$(filter $(CONFIG_BONDING),y m))
 ifneq ($(findstring 4.4, $(KERNELVERSION)),)
 ccflags-y += -DBONDING_SUPPORT
 endif