[altq 1099] Re: problem in ipv6 tos marking patch

[Kenjiro Cho <kjc@csl.sony.co.jp>]

Ji-Eon Kim wrote:
> My objective is establish ipv6 Diffserv testbed using altq based on FreeBSD.
> Altq may not support IPv6 tos marking.
> Kenjiro wrote the method to patch in the mailing-list, I think it is right.
> But I don't know how to apply the patch which Kenjiro wrote in mailing-list.
> 
> Following is the method I did.
> ---------------------------------------------------------------------------------
> diff -urN ../sys/netinet6/ip6_input.c ./netinet6/ip6_input.c
> --- ../sys/netinet6/ip6_input.c Fri Apr 20 09:17:51 2001
> +++ ./netinet6/ip6_input.c      Thu May 24 20:03:07 2001
> @@ -328,6 +328,12 @@
>                         return;
>         }
> 
> #I think there are some problem above passage.
> #Could you check it is right?
> 
> +#ifdef ALTQ
> +       if (altq_input != NULL && (*altq_input)(m, AF_INET6) == 0) {
> +               /* packet is dropped by traffic conditioner */
> +               return;
> +       }
> +#endif
> 
> I made a file with above passage, its name is altq_IPv6_Diffserv_marking_patch.diff.

Don't cut the tail of the patch.
patch(1) usually needs 3 lines of context (above and below the change).
The patch file should contain
----------------------------------------------------------------------
diff -urN ../sys/netinet6/ip6_input.c ./netinet6/ip6_input.c
--- ../sys/netinet6/ip6_input.c	Fri Apr 20 09:17:51 2001
+++ ./netinet6/ip6_input.c	Thu May 24 20:03:07 2001
@@ -328,6 +328,12 @@
 			return;
 	}
 
+#ifdef ALTQ
+	if (altq_input != NULL && (*altq_input)(m, AF_INET6) == 0) {
+		/* packet is dropped by traffic conditioner */
+		return;
+	}
+#endif
 	/*
 	 * Scope check
 	 */
----------------------------------------------------------------------

The rest of your procedure seems ok.

-Kenjiro