summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernel-8.0/freebsd-mcast-filter-array-in-sync.patch14
-rw-r--r--kernel-8.0/freebsd-mcast-uninited.patch12
-rw-r--r--kernel-8.0/freebsd-route-messages-respect-fib-2.patch16
3 files changed, 16 insertions, 26 deletions
diff --git a/kernel-8.0/freebsd-mcast-filter-array-in-sync.patch b/kernel-8.0/freebsd-mcast-filter-array-in-sync.patch
deleted file mode 100644
index 49f2408..0000000
--- a/kernel-8.0/freebsd-mcast-filter-array-in-sync.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- sys/netinet/in_mcast.c.orig 2009-09-09 19:33:22.000000000 +0000
-+++ sys/netinet/in_mcast.c 2009-09-10 05:28:20.000000000 +0000
-@@ -2280,7 +2292,9 @@
-
- if (is_final) {
-- /* Remove the gap in the membership array. */
-- for (++idx; idx < imo->imo_num_memberships; ++idx)
-+ /* Remove the gap in the membership and filter array. */
-+ for (++idx; idx < imo->imo_num_memberships; ++idx) {
- imo->imo_membership[idx-1] = imo->imo_membership[idx];
-+ imo->imo_mfilters[idx-1] = imo->imo_mfilters[idx];
-+ }
- imo->imo_num_memberships--;
- }
diff --git a/kernel-8.0/freebsd-mcast-uninited.patch b/kernel-8.0/freebsd-mcast-uninited.patch
deleted file mode 100644
index 42660f7..0000000
--- a/kernel-8.0/freebsd-mcast-uninited.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- sys/netinet/in_mcast.c.orig 2009-08-03 08:13:06.000000000 +0000
-+++ sys/netinet/in_mcast.c 2009-09-09 15:01:24.000000000 +0000
-@@ -2024,6 +2050,9 @@
- error = ENOMEM;
- goto out_imo_free;
- }
-+ } else if (is_new) {
-+ /* Old style ASM filter mode is always exclude */
-+ imf_init(imf, MCAST_UNDEFINED, MCAST_EXCLUDE);
- }
-
- /*
diff --git a/kernel-8.0/freebsd-route-messages-respect-fib-2.patch b/kernel-8.0/freebsd-route-messages-respect-fib-2.patch
index 514646f..cd4b99f 100644
--- a/kernel-8.0/freebsd-route-messages-respect-fib-2.patch
+++ b/kernel-8.0/freebsd-route-messages-respect-fib-2.patch
@@ -232,3 +232,19 @@
+#define PACKET_TAG_RTSOCK 25 /* rtsock extra info */
#define PACKET_TAG_IPOPTIONS 27 /* Saved IP options */
#define PACKET_TAG_CARP 28 /* CARP info */
+--- sys/netinet/in.c.orig 2009-09-28 23:45:49.000000000 +0000
++++ sys/netinet/in.c 2009-09-28 23:46:35.000000000 +0000
+@@ -1012,5 +1012,5 @@
+ rt_newaddrmsg(RTM_ADD,
+ (struct ifaddr *)target,
+- 0, &msg_rt);
++ 0, &msg_rt, -1);
+ RTFREE(pfx_ro.ro_rt);
+ }
+@@ -1073,5 +1073,5 @@
+ rt_newaddrmsg(RTM_DELETE,
+ (struct ifaddr *)target,
+- 0, &rt);
++ 0, &rt, -1);
+ return (0);
+ }