diff options
| author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-03-21 09:25:49 +0000 |
|---|---|---|
| committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2020-03-21 09:51:40 +0000 |
| commit | e6e1e12dc3230bdadf74485dbf47beb52570920c (patch) | |
| tree | 02ecf93ed176e8735bc0b3c4ed11e2b1c6a3260b | |
| parent | 2bd56595a65b8aea3fe1bff8493787065a24f9b8 (diff) | |
| download | upstream-e6e1e12dc3230bdadf74485dbf47beb52570920c.tar.gz upstream-e6e1e12dc3230bdadf74485dbf47beb52570920c.tar.bz2 upstream-e6e1e12dc3230bdadf74485dbf47beb52570920c.zip | |
kernel: connmark set-dscpmark fix build on 5.4
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>
| -rw-r--r-- | target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch b/target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch index f5ca1bef6e..2d3fe01a75 100644 --- a/target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch +++ b/target/linux/generic/hack-5.4/645-netfilter-connmark-introduce-set-dscpmark.patch @@ -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 { |