From: Martin Schiller Date: Wed, 5 Feb 2020 07:12:54 +0000 (+0100) Subject: kernel: fix xt_connmark.h X-Git-Tag: v21.02.0-rc1~3765 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fhauke.git;a=commitdiff_plain;h=54e39ddc2e0de0b5af45a8ba4349263410c4d5d8 kernel: fix xt_connmark.h Commit a1cfe0dcbb24 (kernel: connmark set-dscpmark follow upstreamimg attempt") broke the usage of xt_connmark.h in user-space (e.g. strongswan), because the BIT() macro is unknown there. Fixes: a1cfe0dcbb24 (kernel: connmark set-dscpmark follow upstreamimg attempt") Signed-off-by: Martin Schiller --- diff --git a/target/linux/generic/hack-4.19/645-netfilter-connmark-introduce-set-dscpmark.patch b/target/linux/generic/hack-4.19/645-netfilter-connmark-introduce-set-dscpmark.patch index a4f246d112..ca98187059 100644 --- a/target/linux/generic/hack-4.19/645-netfilter-connmark-introduce-set-dscpmark.patch +++ b/target/linux/generic/hack-4.19/645-netfilter-connmark-introduce-set-dscpmark.patch @@ -87,8 +87,8 @@ Signed-off-by: Kevin Darbyshire-Bryant }; enum { -+ XT_CONNMARK_VALUE = BIT(0), -+ XT_CONNMARK_DSCP = BIT(1) ++ XT_CONNMARK_VALUE = (1 << 0), ++ XT_CONNMARK_DSCP = (1 << 1) +}; + +enum {