kernel: connmark set-dscpmark fix build on 5.4
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Sat, 21 Mar 2020 09:25:49 +0000 (09:25 +0000)
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Sat, 21 Mar 2020 09:51:40 +0000 (09:51 +0000)
Fix header change that was done for kernel but 4.19 got missed for 5.4.

Solves nasty errors like:

8.4.0_musl/include/linux/netfilter/xt_CONNMARK.h:5,
                from connmark_listener.c:30:
/builder/shared-workdir/build/sdk/staging_dir/toolchain-aarch64_cortex-a53_gcc-8.4.0_musl/include/linux/netfilter/xt_connmark.h:23:2: error: enumerator value for 'XT_CONNMARK_VALUE' is not an integer constant
 XT_CONNMARK_VALUE = BIT(0),
 ^~~~~~~~~~~~~~~~~
/builder/shared-workdir/build/sdk/staging_dir/toolchain-aarch64_cortex-a53_gcc-8.4.0_musl/include/linux/netfilter/xt_connmark.h:25:1: error: enumerator value for 'XT_CONNMARK_DSCP' is not an integer constant
};

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch

index f5ca1bef6eca64e3917c589f57801d0ea34538fe..2d3fe01a755b9eb0a0b2bc0494bb002d735c4390 100644 (file)
@@ -87,8 +87,8 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
  };
  
  enum {
-+      XT_CONNMARK_VALUE = BIT(0),
-+      XT_CONNMARK_DSCP = BIT(1)
++      XT_CONNMARK_VALUE =     (1 << 0),
++      XT_CONNMARK_DSCP =      (1 << 1)
 +};
 +
 +enum {