Module Name: src
Committed By: ozaki-r
Date: Fri Nov 28 08:29:01 UTC 2014
Modified Files:
src/sys/net: if.c if.h if_ethersubr.c if_ieee1394subr.c if_spppsubr.c
if_tokensubr.c
Log Message:
Remove dead codes and make if_free_sadl static
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.300 src/sys/net/if.c
cvs rdiff -u -r1.180 -r1.181 src/sys/net/if.h
cvs rdiff -u -r1.204 -r1.205 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.47 -r1.48 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.130 -r1.131 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.65 -r1.66 src/sys/net/if_tokensubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.299 src/sys/net/if.c:1.300
--- src/sys/net/if.c:1.299 Thu Nov 27 03:15:51 2014
+++ src/sys/net/if.c Fri Nov 28 08:29:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.299 2014/11/27 03:15:51 ozaki-r Exp $ */
+/* $NetBSD: if.c,v 1.300 2014/11/28 08:29:00 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.299 2014/11/27 03:15:51 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.300 2014/11/28 08:29:00 ozaki-r Exp $");
#include "opt_inet.h"
@@ -193,6 +193,7 @@ static void if_detach_queues(struct ifne
static void sysctl_sndq_setup(struct sysctllog **, const char *,
struct ifaltq *);
static void if_slowtimo(void *);
+static void if_free_sadl(struct ifnet *);
#if defined(INET) || defined(INET6)
static void sysctl_net_pktq_setup(struct sysctllog **, int);
@@ -468,10 +469,9 @@ if_activate_sadl(struct ifnet *ifp, stru
/*
* Free the link level name for the specified interface. This is
- * a detach helper. This is called from if_detach() or from
- * link layer type specific detach functions.
+ * a detach helper. This is called from if_detach().
*/
-void
+static void
if_free_sadl(struct ifnet *ifp)
{
struct ifaddr *ifa;
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.180 src/sys/net/if.h:1.181
--- src/sys/net/if.h:1.180 Thu Nov 27 03:15:51 2014
+++ src/sys/net/if.h Fri Nov 28 08:29:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.h,v 1.180 2014/11/27 03:15:51 ozaki-r Exp $ */
+/* $NetBSD: if.h,v 1.181 2014/11/28 08:29:00 ozaki-r Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -864,7 +864,6 @@ void if_activate_sadl(struct ifnet *, st
const struct sockaddr_dl *);
void if_set_sadl(struct ifnet *, const void *, u_char, bool);
void if_alloc_sadl(struct ifnet *);
-void if_free_sadl(struct ifnet *);
void if_attach(struct ifnet *);
void if_attachdomain(void);
void if_attachdomain1(struct ifnet *);
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.204 src/sys/net/if_ethersubr.c:1.205
--- src/sys/net/if_ethersubr.c:1.204 Sun Aug 10 16:44:36 2014
+++ src/sys/net/if_ethersubr.c Fri Nov 28 08:29:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.204 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.205 2014/11/28 08:29:00 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.204 2014/08/10 16:44:36 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.205 2014/11/28 08:29:00 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -1048,10 +1048,6 @@ ether_ifdetach(struct ifnet *ifp)
}
splx(s);
-#if 0 /* done in if_detach() */
- if_free_sadl(ifp);
-#endif
-
ifp->if_mowner = NULL;
MOWNER_DETACH(&ec->ec_rx_mowner);
MOWNER_DETACH(&ec->ec_tx_mowner);
Index: src/sys/net/if_ieee1394subr.c
diff -u src/sys/net/if_ieee1394subr.c:1.47 src/sys/net/if_ieee1394subr.c:1.48
--- src/sys/net/if_ieee1394subr.c:1.47 Thu Jun 5 23:48:16 2014
+++ src/sys/net/if_ieee1394subr.c Fri Nov 28 08:29:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ieee1394subr.c,v 1.47 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: if_ieee1394subr.c,v 1.48 2014/11/28 08:29:00 ozaki-r Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.47 2014/06/05 23:48:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ieee1394subr.c,v 1.48 2014/11/28 08:29:00 ozaki-r Exp $");
#include "opt_inet.h"
@@ -707,9 +707,6 @@ ieee1394_ifdetach(struct ifnet *ifp)
bpf_detach(ifp);
free(__UNCONST(ifp->if_broadcastaddr), M_DEVBUF);
ifp->if_broadcastaddr = NULL;
-#if 0 /* done in if_detach() */
- if_free_sadl(ifp);
-#endif
}
int
Index: src/sys/net/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.130 src/sys/net/if_spppsubr.c:1.131
--- src/sys/net/if_spppsubr.c:1.130 Fri Jun 6 22:15:32 2014
+++ src/sys/net/if_spppsubr.c Fri Nov 28 08:29:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.130 2014/06/06 22:15:32 rmind Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.131 2014/11/28 08:29:00 ozaki-r Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.130 2014/06/06 22:15:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.131 2014/11/28 08:29:00 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -950,10 +950,6 @@ sppp_detach(struct ifnet *ifp)
if (sp->myauth.secret) free(sp->myauth.secret, M_DEVBUF);
if (sp->hisauth.name) free(sp->hisauth.name, M_DEVBUF);
if (sp->hisauth.secret) free(sp->hisauth.secret, M_DEVBUF);
-
-#if 0 /* done in if_detach() */
- if_free_sadl(ifp);
-#endif
}
/*
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.65 src/sys/net/if_tokensubr.c:1.66
--- src/sys/net/if_tokensubr.c:1.65 Thu Jun 5 23:48:16 2014
+++ src/sys/net/if_tokensubr.c Fri Nov 28 08:29:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.65 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.66 2014/11/28 08:29:00 ozaki-r Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.65 2014/06/05 23:48:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.66 2014/11/28 08:29:00 ozaki-r Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -554,7 +554,4 @@ token_ifdetach(struct ifnet *ifp)
{
bpf_detach(ifp);
-#if 0 /* done in if_detach() */
- if_free_sadl(ifp);
-#endif
}
