Add fcu(4/macppc) to RAMDISK
Without this driver, it's impossible to upgrade my PowerMac7,3 without hearing a fan symphony. ok? Index: conf/RAMDISK === RCS file: /cvs/src/sys/arch/macppc/conf/RAMDISK,v retrieving revision 1.97 diff -u -p -r1.97 RAMDISK --- conf/RAMDISK4 Nov 2013 14:07:16 - 1.97 +++ conf/RAMDISK9 Nov 2013 18:51:13 - @@ -183,6 +183,26 @@ wi*at uhub?# WaveLAN IEEE 802.11DS #ugen* at uhub?# USB Generic driver umass* at uhub?# USB Mass Storage devices +# I2C bus support +iic* at kiic? +#iic* at piic? +#iic* at smu? + +# I2C devices +#lmtemp* at iic? +#lmenv*at iic? +#maxtmp* at iic? +#adc* at iic? +#tsl* at iic? +#admtmp* at iic? +#pcagpio* at iic? +#gpio* at pcagpio? +#maxds*at iic? +fcu* at iic? +#adt* at iic? +#asms* at iic? +#spdmem* at mem? + # CardBus bus support cardbus* at cardslot? pcmcia*at cardslot?
Re: bgpd: fib-priority
now with reload working; check RTP_NONE fib-priority = RTP_MAX
test reports / comments / OKs?
diff --git bgpd.c bgpd.c
index 9c48bb3..8ad95fe 100644
--- bgpd.c
+++ bgpd.c
@@ -43,7 +43,7 @@ int check_child(pid_t, const char *);
intsend_filterset(struct imsgbuf *, struct filter_set_head *);
intreconfigure(char *, struct bgpd_config *, struct mrt_head *,
struct peer **);
-intdispatch_imsg(struct imsgbuf *, int);
+intdispatch_imsg(struct imsgbuf *, int, struct bgpd_config *);
intcontrol_setup(struct bgpd_config *);
int rfd = -1;
@@ -276,12 +276,14 @@ main(int argc, char *argv[])
}
if (nfds 0 pfd[PFD_PIPE_SESSION].revents POLLIN) {
- if (dispatch_imsg(ibuf_se, PFD_PIPE_SESSION) == -1)
+ if (dispatch_imsg(ibuf_se, PFD_PIPE_SESSION, conf) ==
+ -1)
quit = 1;
}
if (nfds 0 pfd[PFD_PIPE_ROUTE].revents POLLIN) {
- if (dispatch_imsg(ibuf_rde, PFD_PIPE_ROUTE) == -1)
+ if (dispatch_imsg(ibuf_rde, PFD_PIPE_ROUTE, conf) ==
+ -1)
quit = 1;
}
@@ -359,7 +361,7 @@ main(int argc, char *argv[])
control_cleanup(conf.csock);
control_cleanup(conf.rcsock);
carp_demote_shutdown();
- kr_shutdown();
+ kr_shutdown(conf.fib_priority);
pftable_clear_all();
free(conf.listen_addrs);
@@ -468,7 +470,7 @@ reconfigure(char *conffile, struct bgpd_config *conf,
struct mrt_head *mrt_l,
while ((rr = SIMPLEQ_FIRST(ribnames))) {
SIMPLEQ_REMOVE_HEAD(ribnames, entry);
if (ktable_update(rr-rtableid, rr-name, NULL,
- rr-flags) == -1) {
+ rr-flags, conf-fib_priority) == -1) {
log_warnx(failed to load rdomain %d,
rr-rtableid);
return (-1);
@@ -505,7 +507,7 @@ reconfigure(char *conffile, struct bgpd_config *conf,
struct mrt_head *mrt_l,
while ((rd = SIMPLEQ_FIRST(rdom_l)) != NULL) {
SIMPLEQ_REMOVE_HEAD(rdom_l, entry);
if (ktable_update(rd-rtableid, rd-descr, rd-ifmpe,
- rd-flags) == -1) {
+ rd-flags, conf-fib_priority) == -1) {
log_warnx(failed to load rdomain %d,
rd-rtableid);
return (-1);
@@ -551,7 +553,7 @@ reconfigure(char *conffile, struct bgpd_config *conf,
struct mrt_head *mrt_l,
}
int
-dispatch_imsg(struct imsgbuf *ibuf, int idx)
+dispatch_imsg(struct imsgbuf *ibuf, int idx, struct bgpd_config *conf)
{
struct imsg imsg;
ssize_t n;
@@ -580,7 +582,8 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx)
else if (imsg.hdr.len != IMSG_HEADER_SIZE +
sizeof(struct kroute_full))
log_warnx(wrong imsg len);
- else if (kr_change(imsg.hdr.peerid, imsg.data))
+ else if (kr_change(imsg.hdr.peerid, imsg.data,
+ conf-fib_priority))
rv = -1;
break;
case IMSG_KROUTE_DELETE:
@@ -589,7 +592,8 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx)
else if (imsg.hdr.len != IMSG_HEADER_SIZE +
sizeof(struct kroute_full))
log_warnx(wrong imsg len);
- else if (kr_delete(imsg.hdr.peerid, imsg.data))
+ else if (kr_delete(imsg.hdr.peerid, imsg.data,
+ conf-fib_priority))
rv = -1;
break;
case IMSG_NEXTHOP_ADD:
@@ -652,13 +656,15 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx)
if (idx != PFD_PIPE_SESSION)
log_warnx(couple request not from SE);
else
- kr_fib_couple(imsg.hdr.peerid);
+ kr_fib_couple(imsg.hdr.peerid,
+ conf-fib_priority);
break;
case IMSG_CTL_FIB_DECOUPLE:
if (idx != PFD_PIPE_SESSION)
log_warnx(decouple request not from SE);
else
- kr_fib_decouple(imsg.hdr.peerid);
+ kr_fib_decouple(imsg.hdr.peerid,
+ conf-fib_priority);
break;
case IMSG_CTL_KROUTE:
case IMSG_CTL_KROUTE_ADDR:
@@
Re: bgpd: fib-priority
Hi Florian,
good job.
I think it's better to set minimum to RTP_CONNECTED+1 instead of
RTP_NONE+1
--
Best regards,
Loïc BLOT,
UNIX systems, security and network engineer
http://www.unix-experience.fr
Le samedi 09 novembre 2013 à 21:04 +, Florian Obser a écrit :
now with reload working; check RTP_NONE fib-priority = RTP_MAX
test reports / comments / OKs?
diff --git bgpd.c bgpd.c
index 9c48bb3..8ad95fe 100644
--- bgpd.c
+++ bgpd.c
@@ -43,7 +43,7 @@ int check_child(pid_t, const char *);
int send_filterset(struct imsgbuf *, struct filter_set_head *);
int reconfigure(char *, struct bgpd_config *, struct mrt_head *,
struct peer **);
-int dispatch_imsg(struct imsgbuf *, int);
+int dispatch_imsg(struct imsgbuf *, int, struct bgpd_config *);
int control_setup(struct bgpd_config *);
int rfd = -1;
@@ -276,12 +276,14 @@ main(int argc, char *argv[])
}
if (nfds 0 pfd[PFD_PIPE_SESSION].revents POLLIN) {
- if (dispatch_imsg(ibuf_se, PFD_PIPE_SESSION) == -1)
+ if (dispatch_imsg(ibuf_se, PFD_PIPE_SESSION, conf) ==
+ -1)
quit = 1;
}
if (nfds 0 pfd[PFD_PIPE_ROUTE].revents POLLIN) {
- if (dispatch_imsg(ibuf_rde, PFD_PIPE_ROUTE) == -1)
+ if (dispatch_imsg(ibuf_rde, PFD_PIPE_ROUTE, conf) ==
+ -1)
quit = 1;
}
@@ -359,7 +361,7 @@ main(int argc, char *argv[])
control_cleanup(conf.csock);
control_cleanup(conf.rcsock);
carp_demote_shutdown();
- kr_shutdown();
+ kr_shutdown(conf.fib_priority);
pftable_clear_all();
free(conf.listen_addrs);
@@ -468,7 +470,7 @@ reconfigure(char *conffile, struct bgpd_config *conf,
struct mrt_head *mrt_l,
while ((rr = SIMPLEQ_FIRST(ribnames))) {
SIMPLEQ_REMOVE_HEAD(ribnames, entry);
if (ktable_update(rr-rtableid, rr-name, NULL,
- rr-flags) == -1) {
+ rr-flags, conf-fib_priority) == -1) {
log_warnx(failed to load rdomain %d,
rr-rtableid);
return (-1);
@@ -505,7 +507,7 @@ reconfigure(char *conffile, struct bgpd_config *conf,
struct mrt_head *mrt_l,
while ((rd = SIMPLEQ_FIRST(rdom_l)) != NULL) {
SIMPLEQ_REMOVE_HEAD(rdom_l, entry);
if (ktable_update(rd-rtableid, rd-descr, rd-ifmpe,
- rd-flags) == -1) {
+ rd-flags, conf-fib_priority) == -1) {
log_warnx(failed to load rdomain %d,
rd-rtableid);
return (-1);
@@ -551,7 +553,7 @@ reconfigure(char *conffile, struct bgpd_config *conf,
struct mrt_head *mrt_l,
}
int
-dispatch_imsg(struct imsgbuf *ibuf, int idx)
+dispatch_imsg(struct imsgbuf *ibuf, int idx, struct bgpd_config *conf)
{
struct imsg imsg;
ssize_t n;
@@ -580,7 +582,8 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx)
else if (imsg.hdr.len != IMSG_HEADER_SIZE +
sizeof(struct kroute_full))
log_warnx(wrong imsg len);
- else if (kr_change(imsg.hdr.peerid, imsg.data))
+ else if (kr_change(imsg.hdr.peerid, imsg.data,
+ conf-fib_priority))
rv = -1;
break;
case IMSG_KROUTE_DELETE:
@@ -589,7 +592,8 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx)
else if (imsg.hdr.len != IMSG_HEADER_SIZE +
sizeof(struct kroute_full))
log_warnx(wrong imsg len);
- else if (kr_delete(imsg.hdr.peerid, imsg.data))
+ else if (kr_delete(imsg.hdr.peerid, imsg.data,
+ conf-fib_priority))
rv = -1;
break;
case IMSG_NEXTHOP_ADD:
@@ -652,13 +656,15 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx)
if (idx != PFD_PIPE_SESSION)
log_warnx(couple request not from SE);
else
- kr_fib_couple(imsg.hdr.peerid);
+ kr_fib_couple(imsg.hdr.peerid,
+ conf-fib_priority);
break;
case IMSG_CTL_FIB_DECOUPLE:
if (idx != PFD_PIPE_SESSION)
log_warnx(decouple request not from SE);
else
- kr_fib_decouple(imsg.hdr.peerid);
+
Re: Add fcu(4/macppc) to RAMDISK
On Sat, Nov 09, 2013 at 08:36:23PM +0100, Martin Pieuchot wrote: Without this driver, it's impossible to upgrade my PowerMac7,3 without hearing a fan symphony. ok? As long as all the media still fit this is ok krw@. I don't think there are many in macppc. Ken Index: conf/RAMDISK === RCS file: /cvs/src/sys/arch/macppc/conf/RAMDISK,v retrieving revision 1.97 diff -u -p -r1.97 RAMDISK --- conf/RAMDISK 4 Nov 2013 14:07:16 - 1.97 +++ conf/RAMDISK 9 Nov 2013 18:51:13 - @@ -183,6 +183,26 @@ wi* at uhub?# WaveLAN IEEE 802.11DS #ugen* at uhub?# USB Generic driver umass* at uhub?# USB Mass Storage devices +# I2C bus support +iic* at kiic? +#iic*at piic? +#iic*at smu? + +# I2C devices +#lmtemp* at iic? +#lmenv* at iic? +#maxtmp* at iic? +#adc*at iic? +#tsl*at iic? +#admtmp* at iic? +#pcagpio*at iic? +#gpio* at pcagpio? +#maxds* at iic? +fcu* at iic? +#adt*at iic? +#asms* at iic? +#spdmem* at mem? + # CardBus bus support cardbus* at cardslot? pcmcia* at cardslot?
