Author: glebius
Date: Fri Dec 16 14:28:34 2011
New Revision: 228576
URL: http://svn.freebsd.org/changeset/base/228576
Log:
- Rename if_carp.ko to carp.ko.
- carp.ko depends on sha1.c
Added:
head/sys/modules/carp/
- copied from r228573, head/sys/modules/if_carp/
Deleted:
head/sys/modules/if_carp/
Modified:
head/ObsoleteFiles.inc
head/sys/boot/forth/loader.conf
head/sys/modules/Makefile
head/sys/modules/carp/Makefile
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Fri Dec 16 14:19:46 2011 (r228575)
+++ head/ObsoleteFiles.inc Fri Dec 16 14:28:34 2011 (r228576)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20111216: carp(4) module renamed
+OLD_FILES+=boot/kernel/if_carp.ko
# 20111214: eventtimers(7) moved to eventtimers(4)
OLD_FILES+=usr/share/man/man7/eventtimers.7.gz
# 20111125: amd(4) removed
Modified: head/sys/boot/forth/loader.conf
==============================================================================
--- head/sys/boot/forth/loader.conf Fri Dec 16 14:19:46 2011
(r228575)
+++ head/sys/boot/forth/loader.conf Fri Dec 16 14:28:34 2011
(r228576)
@@ -260,6 +260,7 @@ pf_load="NO" # packet filter
bridgestp_load="NO" # if_bridge(4) support
miibus_load="NO" # miibus support, needed for some drivers
+carp_load="NO" # carp(4) protocol
if_ae_load="NO" # Attansic/Atheros L2 FastEthernet
if_age_load="NO" # Attansic/Atheros L1 Gigabit Ethernet
if_alc_load="NO" # Atheros AR8131/AR8132 Ethernet
@@ -275,7 +276,6 @@ if_bridge_load="NO" # if_bridge(4) devi
if_bwi_load="NO" # Broadcom BCM53xx IEEE 802.11b/g wireness NICs
if_bwn_load="NO" # Broadcom BCM43xx IEEE 802.11 wireless NICs
if_bxe_load="NO" # Broadcom NetXtreme II 10Gb Ethernet
-if_carp_load="NO" # carp(4) devices
if_cas_load="NO" # Sun Cassini/Cassini+ and NS DP83065 Saturn
if_cm_load="NO" # SMC (90c26, 90c56, 90c66)
if_cs_load="NO" # Crystal Semiconductor CS8920
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Fri Dec 16 14:19:46 2011 (r228575)
+++ head/sys/modules/Makefile Fri Dec 16 14:28:34 2011 (r228576)
@@ -50,6 +50,7 @@ SUBDIR= ${_3dfx} \
${_canbepm} \
${_canbus} \
${_cardbus} \
+ ${_carp} \
cas \
${_cbb} \
cc \
@@ -117,7 +118,6 @@ SUBDIR= ${_3dfx} \
${_ida} \
${_ie} \
if_bridge \
- ${_if_carp} \
if_disc \
if_edsc \
if_ef \
@@ -374,7 +374,7 @@ _if_gre= if_gre
.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
defined(ALL_MODULES)
-_if_carp= if_carp
+_carp= carp
.endif
.if ${MK_IPFILTER} != "no" || defined(ALL_MODULES)
Modified: head/sys/modules/carp/Makefile
==============================================================================
--- head/sys/modules/if_carp/Makefile Fri Dec 16 12:53:15 2011
(r228573)
+++ head/sys/modules/carp/Makefile Fri Dec 16 14:28:34 2011
(r228576)
@@ -1,12 +1,14 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../netinet
+.PATH: ${.CURDIR}/../../crypto
.include <bsd.own.mk>
-KMOD= if_carp
-SRCS= ip_carp.c
-SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h
+KMOD= carp
+SRCS= ip_carp.c sha1.c
+SRCS+= device_if.h bus_if.h vnode_if.h
+SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h
.if !defined(KERNBUILDDIR)
.if ${MK_INET_SUPPORT} != "no"
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
