From e59eff9ad3285838730acf48f6d066cec0e53114 Mon Sep 17 00:00:00 2001
From: Kristof Provost <kp@FreeBSD.org>
Date: Tue, 24 Aug 2021 12:24:28 +0200
Subject: [PATCH] pfctl: fix killing states by ID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since the conversion to the new DIOCKILLSTATESNV the kernel no longer
exists the id and creatorid to be big-endian.
As a result killing states by id (i.e. `pfctl -k id -k 12345`) no longer
worked.

Reported by:	Özkan KIRIK
MFC after:	1 week
Sponsored by:	Rubicon Communications, LLC ("Netgate")
---
 sbin/pfctl/pfctl.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 6c689edf7c43..ad2cfd4e63bc 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -908,7 +908,6 @@ pfctl_id_kill_states(int dev, const char *iface, int opts)
 
 	if ((sscanf(state_kill[1], "%jx/%x",
 	    &kill.cmp.id, &kill.cmp.creatorid)) == 2)
-		HTONL(kill.cmp.creatorid);
 	else if ((sscanf(state_kill[1], "%jx", &kill.cmp.id)) == 1) {
 		kill.cmp.creatorid = 0;
 	} else {
@@ -920,7 +919,6 @@ pfctl_id_kill_states(int dev, const char *iface, int opts)
 		usage();
 	}
 
-	kill.cmp.id = htobe64(kill.cmp.id);
 	if (pfctl_kill_states(dev, &kill, &killed))
 		err(1, "DIOCKILLSTATES");