diff options
| author | glebius <glebius@FreeBSD.org> | 2011-12-16 14:28:34 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2011-12-16 14:28:34 +0000 |
| commit | d5d5148ff9afdad28726e8962e3cba2cf3d29bfb (patch) | |
| tree | 4bb13c0f6eac2b5aa7df8883ffb827a53054691e | |
| parent | bdf9f67646239b0d85ac3d47928768aefa05f164 (diff) | |
| download | FreeBSD-src-d5d5148ff9afdad28726e8962e3cba2cf3d29bfb.zip FreeBSD-src-d5d5148ff9afdad28726e8962e3cba2cf3d29bfb.tar.gz | |
- Rename if_carp.ko to carp.ko.
- carp.ko depends on sha1.c
| -rw-r--r-- | ObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | sys/boot/forth/loader.conf | 2 | ||||
| -rw-r--r-- | sys/modules/Makefile | 4 | ||||
| -rw-r--r-- | sys/modules/carp/Makefile (renamed from sys/modules/if_carp/Makefile) | 8 |
4 files changed, 10 insertions, 6 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 2fa9955..8fd0b13 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -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 diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 7a20f91..493f6c0 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -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) devices 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 diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 50f0675..5ee3c08 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -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) diff --git a/sys/modules/if_carp/Makefile b/sys/modules/carp/Makefile index f1a0dea..ca3d5da 100644 --- a/sys/modules/if_carp/Makefile +++ b/sys/modules/carp/Makefile @@ -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" |
