On Sat, Aug 08 2020, Florian Obser <flor...@openbsd.org> wrote:
> On Fri, Aug 07, 2020 at 11:52:46PM +0200, Jeremie Courreges-Anglas wrote:
>> If you don't want to remove M_ACAST from sys/mbuf.h, can you please at
>> least change the comment? /* obsolete */ or something.
>
> Good point, I forgot to ask about what to do with the flag.
> I think we can remove it, from what I understand %b in printf(9) works
> fine with a sparse decoding string.
Should be fine indeed.
> It compiles but I have no idea how to test it in ddb.
show mbuf addr in a function that uses an mbuf?
> OK? Better to leave out the comment?
I think the comment can be dropped along with the #define. Userland
shouldn't be poking at this.
ok jca@
> diff --git sys/mbuf.h sys/mbuf.h
> index d52896d3be8..3ddd1b89d66 100644
> --- sys/mbuf.h
> +++ sys/mbuf.h
> @@ -190,7 +190,7 @@ struct mbuf {
> /* mbuf pkthdr flags, also in m_flags */
> #define M_VLANTAG 0x0020 /* ether_vtag is valid */
> #define M_LOOP 0x0040 /* packet has been sent from local
> machine */
> -#define M_ACAST 0x0080 /* received as IPv6 anycast */
> + /* 0x0080 used to be M_ACAST */
> #define M_BCAST 0x0100 /* sent/received as link-level
> broadcast */
> #define M_MCAST 0x0200 /* sent/received as link-level
> multicast */
> #define M_CONF 0x0400 /* payload was encrypted
> (ESP-transport) */
> @@ -203,14 +203,13 @@ struct mbuf {
> #ifdef _KERNEL
> #define M_BITS \
> ("\20\1M_EXT\2M_PKTHDR\3M_EOR\4M_EXTWR\5M_PROTO1\6M_VLANTAG\7M_LOOP" \
> - "\10M_ACAST\11M_BCAST\12M_MCAST\13M_CONF\14M_AUTH\15M_TUNNEL" \
> + "\11M_BCAST\12M_MCAST\13M_CONF\14M_AUTH\15M_TUNNEL" \
> "\16M_ZEROIZE\17M_COMP\20M_LINK0")
> #endif
>
> /* flags copied when copying m_pkthdr */
> #define M_COPYFLAGS
> (M_PKTHDR|M_EOR|M_PROTO1|M_BCAST|M_MCAST|M_CONF|M_COMP|\
> - M_AUTH|M_LOOP|M_TUNNEL|M_LINK0|M_VLANTAG|M_ACAST|\
> - M_ZEROIZE)
> + M_AUTH|M_LOOP|M_TUNNEL|M_LINK0|M_VLANTAG|M_ZEROIZE)
>
> /* Checksumming flags */
> #define M_IPV4_CSUM_OUT 0x0001 /* IPv4 checksum needed */
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
