Date: Tue, 23 Dec 2014 20:55:00 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276152 - in head: . sys/net Message-ID: <201412232055.sBNKt0Oa040071@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Tue Dec 23 20:54:59 2014 New Revision: 276152 URL: https://svnweb.freebsd.org/changeset/base/276152 Log: Remove if_stf.h. It contains only one function declaration used by if_stf(4). Also make in_stf_protosw structure static. Deleted: head/sys/net/if_stf.h Modified: head/ObsoleteFiles.inc head/sys/net/if_stf.c Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Tue Dec 23 19:31:56 2014 (r276151) +++ head/ObsoleteFiles.inc Tue Dec 23 20:54:59 2014 (r276152) @@ -38,7 +38,8 @@ # xargs -n1 | sort | uniq -d; # done -# 20141223: remove in6_gif.h and in_gif.h +# 20141223: remove in6_gif.h, in_gif.h and if_stf.h +OLD_FILES+=usr/include/net/if_stf.h OLD_FILES+=usr/include/netinet/in_gif.h OLD_FILES+=usr/include/netinet6/in6_gif.h # 20141202: update to mandoc CVS 20141201 Modified: head/sys/net/if_stf.c ============================================================================== --- head/sys/net/if_stf.c Tue Dec 23 19:31:56 2014 (r276151) +++ head/sys/net/if_stf.c Tue Dec 23 20:54:59 2014 (r276152) @@ -99,7 +99,6 @@ #include <net/route.h> #include <net/netisr.h> #include <net/if_types.h> -#include <net/if_stf.h> #include <net/vnet.h> #include <netinet/in.h> @@ -156,7 +155,8 @@ static MALLOC_DEFINE(M_STF, stfname, "6t static const int ip_stf_ttl = 40; extern struct domain inetdomain; -struct protosw in_stf_protosw = { +static int in_stf_input(struct mbuf **, int *, int); +static struct protosw in_stf_protosw = { .pr_type = SOCK_RAW, .pr_domain = &inetdomain, .pr_protocol = IPPROTO_IPV6, @@ -620,7 +620,7 @@ stf_checkaddr6(sc, in6, inifp) return 0; } -int +static int in_stf_input(struct mbuf **mp, int *offp, int proto) { struct stf_softc *sc;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412232055.sBNKt0Oa040071>