]> git.openfabrics.org - ~emulex/compat-rdma.git/commitdiff
gen-compat-config: Prevent redefining ETH_FLAG_TXVLAN/ETH_FLAG_RXVLAN.
authorVladimir Sokolovsky <vlad@mellanox.com>
Mon, 29 Sep 2014 12:58:24 +0000 (15:58 +0300)
committerVladimir Sokolovsky <vlad@mellanox.com>
Mon, 29 Sep 2014 12:58:24 +0000 (15:58 +0300)
Signed-off-by: Alaa Hleihel <alaa@mellanox.com>
Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
ofed_scripts/gen-compat-config.sh

index 24feb01429955b063cb2400f74bb8615c93b01e4..1d7788121fb7d330cdd37bed80536ec87c597545 100755 (executable)
@@ -271,3 +271,7 @@ if (grep -qw __IFLA_VF_LINK_STATE_MAX ${KLIB_BUILD}/include/uapi/linux/if_link.h
     grep -qw __IFLA_VF_LINK_STATE_MAX ${KLIB_BUILD}/include/linux/if_link.h > /dev/null 2>&1 || grep -qw __IFLA_VF_LINK_STATE_MAX /lib/modules/${KVERSION}/source/include/linux/if_link.h > /dev/null 2>&1); then
        set_config CONFIG_COMPAT_IFLA_VF_LINK_STATE_MAX y
 fi
+
+if (grep -wq "ETH_FLAG_TXVLAN" ${KLIB_BUILD}/include/linux/ethtool.h > /dev/null 2>&1 || grep -wq "ETH_FLAG_TXVLAN" /lib/modules/${KVERSION}/source/include/linux/ethtool.h > /dev/null 2>&1); then
+    set_config CONFIG_COMPAT_IS_ETH_FLAG_TXVLAN y
+fi