Bug 181822

Summary:

[netinet] [patch] drop dead / unused code

Product:

Base System

Reporter:

Sven-Thorsten Dietrich <sven>

Component:

kern

Assignee:

Andrey V. Elsukov <ae>

Status:

Closed FIXED

Severity:

Affects Only Me

Priority:

Normal

Version:

Unspecified

Hardware:

Any

OS:

Any

Attachments:

Description	Flags
file.txt	none

Description Sven-Thorsten Dietrich 2013-09-04 20:50:02 UTC

struct ifr is never used, after making assignments to it's elements.

Drop the relevant code.

Fix: see patch

Patch attached with submission follows:

Comment 1 Mark Linimon freebsd_committer

2013-09-05 03:10:56 UTC

Responsible Changed
From-To: freebsd-bugs->freebsd-net

Over to maintainer(s).

Comment 2 dfilter service freebsd_committer

2013-09-05 09:12:44 UTC

Author: ae
Date: Thu Sep  5 08:12:36 2013
New Revision: 255235
URL: http://svnweb.freebsd.org/changeset/base/255235

Log:
  Remove unused code and sort variables declarations.
  
  PR:		kern/181822
  MFC after:	1 week

Modified:
  head/sys/netinet/ip_mroute.c

Modified: head/sys/netinet/ip_mroute.c
==============================================================================
--- head/sys/netinet/ip_mroute.c	Thu Sep  5 07:13:08 2013	(r255234)
+++ head/sys/netinet/ip_mroute.c	Thu Sep  5 08:12:36 2013	(r255235)
@@ -704,10 +704,9 @@ ip_mrouter_init(struct socket *so, int v
 static int
 X_ip_mrouter_done(void)
 {
-    vifi_t vifi;
-    int i;
     struct ifnet *ifp;
-    struct ifreq ifr;
+    int i;
+    vifi_t vifi;
 
     MROUTER_LOCK();
 
@@ -732,11 +731,6 @@ X_ip_mrouter_done(void)
     for (vifi = 0; vifi < V_numvifs; vifi++) {
 	if (!in_nullhost(V_viftable[vifi].v_lcl_addr) &&
 		!(V_viftable[vifi].v_flags & (VIFF_TUNNEL | VIFF_REGISTER))) {
-	    struct sockaddr_in *so = (struct sockaddr_in *)&(ifr.ifr_addr);
-
-	    so->sin_len = sizeof(struct sockaddr_in);
-	    so->sin_family = AF_INET;
-	    so->sin_addr.s_addr = INADDR_ANY;
 	    ifp = V_viftable[vifi].v_ifp;
 	    if_allmulti(ifp, 0);
 	}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 3 Andrey V. Elsukov freebsd_committer

2013-09-05 09:12:49 UTC

State Changed
From-To: open->patched

Committed. Thanks!

Comment 4 Andrey V. Elsukov freebsd_committer

2013-09-05 09:12:49 UTC

Responsible Changed
From-To: freebsd-net->ae

Take it.

Comment 5 dfilter service freebsd_committer

2013-09-17 19:47:43 UTC

Author: ae
Date: Tue Sep 17 18:47:31 2013
New Revision: 255649
URL: http://svnweb.freebsd.org/changeset/base/255649

Log:
  MFC r255235:
    Remove unused code and sort variables declarations.
  
  PR:		kern/181822

Modified:
  stable/9/sys/netinet/ip_mroute.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/ip_mroute.c
==============================================================================
--- stable/9/sys/netinet/ip_mroute.c	Tue Sep 17 18:46:10 2013	(r255648)
+++ stable/9/sys/netinet/ip_mroute.c	Tue Sep 17 18:47:31 2013	(r255649)
@@ -703,10 +703,9 @@ ip_mrouter_init(struct socket *so, int v
 static int
 X_ip_mrouter_done(void)
 {
-    vifi_t vifi;
-    int i;
     struct ifnet *ifp;
-    struct ifreq ifr;
+    int i;
+    vifi_t vifi;
 
     MROUTER_LOCK();
 
@@ -731,11 +730,6 @@ X_ip_mrouter_done(void)
     for (vifi = 0; vifi < V_numvifs; vifi++) {
 	if (!in_nullhost(V_viftable[vifi].v_lcl_addr) &&
 		!(V_viftable[vifi].v_flags & (VIFF_TUNNEL | VIFF_REGISTER))) {
-	    struct sockaddr_in *so = (struct sockaddr_in *)&(ifr.ifr_addr);
-
-	    so->sin_len = sizeof(struct sockaddr_in);
-	    so->sin_family = AF_INET;
-	    so->sin_addr.s_addr = INADDR_ANY;
 	    ifp = V_viftable[vifi].v_ifp;
 	    if_allmulti(ifp, 0);
 	}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 6 dfilter service freebsd_committer

2013-09-17 19:51:43 UTC

Author: ae
Date: Tue Sep 17 18:51:35 2013
New Revision: 255650
URL: http://svnweb.freebsd.org/changeset/base/255650

Log:
  MFC r255235:
    Remove unused code and sort variables declarations.
  
  PR:		kern/181822

Modified:
  stable/8/sys/netinet/ip_mroute.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/netinet/ip_mroute.c
==============================================================================
--- stable/8/sys/netinet/ip_mroute.c	Tue Sep 17 18:47:31 2013	(r255649)
+++ stable/8/sys/netinet/ip_mroute.c	Tue Sep 17 18:51:35 2013	(r255650)
@@ -705,10 +705,9 @@ ip_mrouter_init(struct socket *so, int v
 static int
 X_ip_mrouter_done(void)
 {
-    vifi_t vifi;
-    int i;
     struct ifnet *ifp;
-    struct ifreq ifr;
+    int i;
+    vifi_t vifi;
 
     MROUTER_LOCK();
 
@@ -733,11 +732,6 @@ X_ip_mrouter_done(void)
     for (vifi = 0; vifi < V_numvifs; vifi++) {
 	if (!in_nullhost(V_viftable[vifi].v_lcl_addr) &&
 		!(V_viftable[vifi].v_flags & (VIFF_TUNNEL | VIFF_REGISTER))) {
-	    struct sockaddr_in *so = (struct sockaddr_in *)&(ifr.ifr_addr);
-
-	    so->sin_len = sizeof(struct sockaddr_in);
-	    so->sin_family = AF_INET;
-	    so->sin_addr.s_addr = INADDR_ANY;
 	    ifp = V_viftable[vifi].v_ifp;
 	    if_allmulti(ifp, 0);
 	}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 7 Andrey V. Elsukov freebsd_committer

2013-09-17 19:51:52 UTC

State Changed
From-To: patched->closed

Merged to stable/9 and satble/8. Thanks!