diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-23 18:25:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-23 18:25:37 +0000 |
commit | 367ce4e075356677bcf5e7bfb792d2bd04dc7b9c (patch) | |
tree | bf90895fed6aa9e1cfbc2958546392e03242a933 /extensions/libxt_MARK.c | |
parent | e99c72d752638b55c64a38706446b1d2744b3342 (diff) | |
parent | 3dd590f33377ffa97da0aca046e4efc5211ef616 (diff) | |
download | iptables-367ce4e075356677bcf5e7bfb792d2bd04dc7b9c.tar.gz |
Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333
Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950
Change-Id: I9a2d6c7fb1cb57743fb349953bf7d84d4a0ac149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'extensions/libxt_MARK.c')
-rw-r--r-- | extensions/libxt_MARK.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c index b765af6c..1536563d 100644 --- a/extensions/libxt_MARK.c +++ b/extensions/libxt_MARK.c @@ -77,8 +77,7 @@ static void mark_tg_help(void) " --set-mark value[/mask] Clear bits in mask and OR value into nfmark\n" " --and-mark bits Binary AND the nfmark with bits\n" " --or-mark bits Binary OR the nfmark with bits\n" -" --xor-mark bits Binary XOR the nfmark with bits\n" -"\n"); +" --xor-mark bits Binary XOR the nfmark with bits\n"); } static void MARK_parse_v0(struct xt_option_call *cb) |