6375443 dead declarations in <inet/ip*.h>

6587730 MATCH_IRE_WQ logic has no consumers
6592926 NCE_F_PROXY handling is a dead-end
6592983 IP ioctl argument extraction logic can be simplified
6592998 SIOC*MSFILTER ioctls can induce panic
6594323 ipif_get_name() could be simpler and used more widely
6595071 ipif_ndp_up()'s second argument is needless
6597721 {O_,}SIOCGLIFCONF have bogus ipi_cmd_type values
6599009 bogus conn_ref assertion in ip_open()

1 files changed, 6 insertions, 6 deletions

diff --git a/usr/src/uts/common/inet/ip/ip_multi.c b/usr/src/uts/common/inet/ip/ip_multi.c
index ad71011575..5816e7791f 100644
--- a/usr/src/uts/common/inet/ip/ip_multi.c
+++ b/usr/src/uts/common/inet/ip/ip_multi.c
@@ -2516,14 +2516,14 @@ ip_sioctl_msfilter(ipif_t *ipif, sin_t *dummy_sin, queue_t *q, mblk_t *mp,
 /*
  * Finds the ipif based on information in the ioctl headers.  Needed to make
  * ip_process_ioctl() happy (it needs to know the ipif for IPI_WR-flagged
- * ioctls prior to calling the ioctl's handler function).  Somewhat analogous
- * to ip_extract_lifreq_cmn() and ip_extract_tunreq().
+ * ioctls prior to calling the ioctl's handler function).
  */
 int
-ip_extract_msfilter(queue_t *q, mblk_t *mp, ipif_t **ipifpp, ipsq_func_t func)
+ip_extract_msfilter(queue_t *q, mblk_t *mp, const ip_ioctl_cmd_t *ipip,
+    cmd_info_t *ci, ipsq_func_t func)
 {
-	struct iocblk *iocp = (struct iocblk *)mp->b_rptr;
-	int cmd = iocp->ioc_cmd, err = 0;
+	int cmd = ipip->ipi_cmd;
+	int err = 0;
 	conn_t *connp;
 	ipif_t *ipif;
 	/* caller has verified this mblk exists */
@@ -2594,7 +2594,7 @@ ip_extract_msfilter(queue_t *q, mblk_t *mp, ipif_t **ipifpp, ipsq_func_t func)
 		}
 	}
 
-	*ipifpp = ipif;
+	ci->ci_ipif = ipif;
 	return (err);
 }