git: d1d0ae97ca88 - main - librss: Remove rss_socket_set_rss_bucket()

The branch main has been updated by markj:

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

commit d1d0ae97ca8837306b2a791829566787d1ac723f
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-02-28 20:57:11 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2023-02-28 20:57:11 +0000

    librss: Remove rss_socket_set_rss_bucket()
    
    In preparation for the removal of the IP_RSS_LISTEN_BUCKET socket
    option.
    
    PR:             261398 (exp-run)
    Reviewed by:    glebius
    Sponsored by:   Klara, Inc.
    Differential Revision:  https://reviews.freebsd.org/D38821
---
 lib/librss/librss.3 |  9 ---------
 lib/librss/librss.c | 32 --------------------------------
 lib/librss/librss.h |  7 -------
 3 files changed, 48 deletions(-)

diff --git a/lib/librss/librss.3 b/lib/librss/librss.3
index 302d431b6c28..469132027b26 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_rss_bucket "int fd" "int af" "int rss_bucket"
-.Ft int
 .Fn rss_sock_set_recvrss "int fd" "int af" "int val"
 .Sh DESCRIPTION
 The
@@ -110,13 +108,6 @@ datagrams/connections that are not initially consumed by a PCB aware
 socket.
 .Pp
 The
-.Fn rss_sock_set_rss_bucket
-function configures the RSS bucket which a socket belongs in.
-Note that TCP sockets created by
-.Xr accept 2
-will automatically be assigned to the RSS bucket.
-.Pp
-The
 .Fn rss_sock_set_recvrss
 function enables or disables receiving RSS related information
 as socket options in.
diff --git a/lib/librss/librss.c b/lib/librss/librss.c
index 4125e94305e2..fcaac4cc7366 100644
--- a/lib/librss/librss.c
+++ b/lib/librss/librss.c
@@ -46,38 +46,6 @@ __FBSDID("$FreeBSD$");
 
 #include "librss.h"
 
-int
-rss_sock_set_rss_bucket(int fd, int af, int rss_bucket)
-{
-	int opt;
-	socklen_t optlen;
-	int retval;
-	int f, p;
-
-	switch (af) {
-	case AF_INET:
-		p = IPPROTO_IP;
-		f = IP_RSS_LISTEN_BUCKET;
-		break;
-	case AF_INET6:
-		p = IPPROTO_IPV6;
-		f = IPV6_RSS_LISTEN_BUCKET;
-		break;
-	default:
-		return (-1);
-	}
-
-	/* Set RSS bucket */
-	opt = rss_bucket;
-	optlen = sizeof(opt);
-	retval = setsockopt(fd, p, f, &opt, optlen);
-	if (retval < 0) {
-		warn("%s: setsockopt(IP_RSS_LISTEN_BUCKET)", __func__);
-		return (-1);
-	}
-	return (0);
-}
-
 int
 rss_sock_set_recvrss(int fd, int af, int val)
 {
diff --git a/lib/librss/librss.h b/lib/librss/librss.h
index 134ae28811a2..c90bff86ae50 100644
--- a/lib/librss/librss.h
+++ b/lib/librss/librss.h
@@ -46,13 +46,6 @@ typedef enum {
 
 typedef void rss_bucket_rebalance_cb_t(void *arg);
 
-/*
- * Set the RSS bucket for the given file descriptor.
- *
- * This must be done before bind().
- */
-extern	int rss_sock_set_rss_bucket(int fd, int af, int rss_bucket);
-
 /*
  * Enable or disable receiving RSS/flowid information on
  * received UDP frames.