From nobody@FreeBSD.org  Wed Sep  4 19:44:52 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 346D75FB
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  4 Sep 2013 19:44:52 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 220622F31
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  4 Sep 2013 19:44:52 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r84JipRI054655
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 4 Sep 2013 19:44:51 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r84JipP9054654;
	Wed, 4 Sep 2013 19:44:51 GMT
	(envelope-from nobody)
Message-Id: <201309041944.r84JipP9054654@oldred.freebsd.org>
Date: Wed, 4 Sep 2013 19:44:51 GMT
From: Sven-Thorsten Dietrich <sven@vyatta.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: drop dead / unused code
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         181822
>Category:       kern
>Synopsis:       [netinet] [patch] drop dead / unused code
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ae
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 04 19:50:02 UTC 2013
>Closed-Date:    Tue Sep 17 18:52:18 UTC 2013
>Last-Modified:  Tue Sep 17 19:00:00 UTC 2013
>Originator:     Sven-Thorsten Dietrich
>Release:        HEAD
>Organization:
Vyatta
>Environment:
>Description:
struct ifr is never used, after making assignments to it's elements.

Drop the relevant code.

>How-To-Repeat:

>Fix:
see patch

Patch attached with submission follows:

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

Drop the relevant code.

Signed-off-by: Sven-Throsten Dietrich <sven@vyatta.com>

Index: netinet/ip_mroute.c
===================================================================
--- netinet/ip_mroute.c	(revision 255189)
+++ netinet/ip_mroute.c	(working copy)
@@ -707,7 +706,6 @@
     vifi_t vifi;
     int i;
     struct ifnet *ifp;
-    struct ifreq ifr;
 
     MROUTER_LOCK();
 
@@ -732,11 +730,6 @@
     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);
 	}


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-net 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Sep 5 02:10:56 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181822 
State-Changed-From-To: open->patched 
State-Changed-By: ae 
State-Changed-When: Thu Sep 5 08:12:49 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 


Responsible-Changed-From-To: freebsd-net->ae 
Responsible-Changed-By: ae 
Responsible-Changed-When: Thu Sep 5 08:12:49 UTC 2013 
Responsible-Changed-Why:  
Take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181822 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/181822: commit references a PR
Date: Thu,  5 Sep 2013 08:12:44 +0000 (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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/181822: commit references a PR
Date: Tue, 17 Sep 2013 18:47:43 +0000 (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"
 
State-Changed-From-To: patched->closed 
State-Changed-By: ae 
State-Changed-When: Tue Sep 17 18:51:52 UTC 2013 
State-Changed-Why:  
Merged to stable/9 and satble/8. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181822 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/181822: commit references a PR
Date: Tue, 17 Sep 2013 18:51:43 +0000 (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"
 
>Unformatted:
