The branch main has been updated by kp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=34641052826c718566b994b75cd2bddb53a21583
commit 34641052826c718566b994b75cd2bddb53a21583
Author: Kristof Provost <k...@freebsd.org>
AuthorDate: 2021-07-08 08:54:16 +0000
Commit: Kristof Provost <k...@freebsd.org>
CommitDate: 2021-07-08 16:56:29 +0000
pf: pf_killstates() never fails, so remove the return value
Suggested by: mjg
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
sys/netpfil/pf/pf_ioctl.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index fece41e917e5..33eb0e15ea57 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -201,7 +201,7 @@ struct cdev *pf_dev;
*/
static void pf_clear_all_states(void);
static unsigned int pf_clear_states(const struct pf_kstate_kill *);
-static int pf_killstates(struct pf_kstate_kill *,
+static void pf_killstates(struct pf_kstate_kill *,
unsigned int *);
static int pf_killstates_row(struct pf_kstate_kill *,
struct pf_idhash *);
@@ -2779,7 +2779,7 @@ DIOCCHANGERULE_error:
break;
psk->psk_killed = 0;
- error = pf_killstates(&kill, &psk->psk_killed);
+ pf_killstates(&kill, &psk->psk_killed);
break;
}
@@ -4834,7 +4834,7 @@ relock_DIOCCLRSTATES:
return (killed);
}
-static int
+static void
pf_killstates(struct pf_kstate_kill *kill, unsigned int *killed)
{
struct pf_kstate *s;
@@ -4847,13 +4847,13 @@ pf_killstates(struct pf_kstate_kill *kill, unsigned int
*killed)
pf_unlink_state(s, PF_ENTER_LOCKED);
*killed = 1;
}
- return (0);
+ return;
}
for (unsigned int i = 0; i <= pf_hashmask; i++)
*killed += pf_killstates_row(kill, &V_pf_idhash[i]);
- return (0);
+ return;
}
static int
@@ -4886,9 +4886,7 @@ pf_killstates_nv(struct pfioc_nv *nv)
if (error)
ERROUT(error);
- error = pf_killstates(&kill, &killed);
- if (error)
- ERROUT(error);
+ pf_killstates(&kill, &killed);
free(nvlpacked, M_NVLIST);
nvlpacked = NULL;
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
