git: b9199d152f3d - main - librss: Remove rss_sock_set_bindmulti()

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=b9199d152f3d61f93c21d63e3c85a5863f9d71e9

commit b9199d152f3d61f93c21d63e3c85a5863f9d71e9
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-02-27 14:50:25 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-02-27 15:03:11 +0000

    librss: Remove rss_sock_set_bindmulti()
    
    In preparation for the removal of the IP(V6)_BINDMULTI option.
    
    PR:             261398 (exp-run)
    Reviewed by:    glebius
    Sponsored by:   Klara, Inc.
    Differential Revision:  https://reviews.freebsd.org/D38574
---
 lib/librss/librss.3 | 12 ------------
 lib/librss/librss.c | 22 ----------------------
 lib/librss/librss.h |  8 --------
 3 files changed, 42 deletions(-)

diff --git a/lib/librss/librss.3 b/lib/librss/librss.3
index 5e52482db5ed..302d431b6c28 100644
--- a/lib/librss/librss.3
+++ b/lib/librss/librss.3
@@ -23,8 +23,6 @@
 .Ft int
 .Fn rss_set_bucket_rebalance_cb "rss_bucket_rebalance_cb_t *cb" "void *cbdata"
 .Ft int
-.Fn rss_sock_set_bindmulti "int fd" "int af" "int val"
-.Ft int
 .Fn rss_sock_set_rss_bucket "int fd" "int af" "int rss_bucket"
 .Ft int
 .Fn rss_sock_set_recvrss "int fd" "int af" "int val"
@@ -102,16 +100,6 @@ Once RSS setup is completed,
 .Fn rss_config_free
 is called to free the RSS configuration structure.
 .Pp
-To make a
-.Vt bind
-socket RSS aware, the
-.Fn rss_sock_set_bindmulti
-function is used to enable or disable per-RSS bucket
-behaviour.
-The socket filedescriptor, address family and enable flag
-.Vt val
-are passed in.
-.Pp
 If
 .Vt val
 is set to 1, the socket can be placed in an RSS bucket and will only accept
diff --git a/lib/librss/librss.c b/lib/librss/librss.c
index f8e16c27a4a1..4125e94305e2 100644
--- a/lib/librss/librss.c
+++ b/lib/librss/librss.c
@@ -46,28 +46,6 @@ __FBSDID("$FreeBSD$");
 
 #include "librss.h"
 
-int
-rss_sock_set_bindmulti(int fd, int af, int val)
-{
-	int opt;
-	socklen_t optlen;
-	int retval;
-
-	/* Set bindmulti */
-	opt = val;
-	optlen = sizeof(opt);
-	retval = setsockopt(fd,
-	    af == AF_INET ? IPPROTO_IP : IPPROTO_IPV6,
-	    af == AF_INET ? IP_BINDMULTI : IPV6_BINDMULTI,
-	    &opt,
-	    optlen);
-	if (retval < 0) {
-		warn("%s: setsockopt(IP_BINDMULTI)", __func__);
-		return (-1);
-	}
-	return (0);
-}
-
 int
 rss_sock_set_rss_bucket(int fd, int af, int rss_bucket)
 {
diff --git a/lib/librss/librss.h b/lib/librss/librss.h
index d0d03df9d5ea..134ae28811a2 100644
--- a/lib/librss/librss.h
+++ b/lib/librss/librss.h
@@ -46,14 +46,6 @@ typedef enum {
 
 typedef void rss_bucket_rebalance_cb_t(void *arg);
 
-/*
- * Enable/disable whether to allow for multiple bind()s to the
- * given PCB entry.
- *
- * This must be done before bind().
- */
-extern	int rss_sock_set_bindmulti(int fd, int af, int val);
-
 /*
  * Set the RSS bucket for the given file descriptor.
  *