The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=3f0871d7fc4e478d85645d1202506143718a6157

commit 3f0871d7fc4e478d85645d1202506143718a6157
Author:     John Baldwin <[email protected]>
AuthorDate: 2022-04-08 00:01:26 +0000
Commit:     John Baldwin <[email protected]>
CommitDate: 2022-04-08 00:01:26 +0000

    ngatm: Expand #if 0 to cover all lines involving mlen.
---
 sys/contrib/ngatm/netnatm/msg/privmsg.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/contrib/ngatm/netnatm/msg/privmsg.c 
b/sys/contrib/ngatm/netnatm/msg/privmsg.c
index 76a7f69aa3c6..73e3944c06e6 100644
--- a/sys/contrib/ngatm/netnatm/msg/privmsg.c
+++ b/sys/contrib/ngatm/netnatm/msg/privmsg.c
@@ -44,7 +44,9 @@ int
 uni_decode_head(struct uni_msg *msg, struct uni_all *out,
     struct unicx *cx __unused)
 {
+#if 0
        u_int mlen;
+#endif
 
        cx->errcnt = 0;
        (void)memset(out, 0, sizeof(struct uni_all));
@@ -92,6 +94,7 @@ uni_decode_head(struct uni_msg *msg, struct uni_all *out,
        
        msg->b_rptr++;
 
+#if 0
        mlen = *msg->b_rptr++ << 8;
        mlen |= *msg->b_rptr++;
 
@@ -100,7 +103,6 @@ uni_decode_head(struct uni_msg *msg, struct uni_all *out,
         * shorten it. If it is shorter, probably one of the IE
         * decoders will break, but we should proceed. 5.5.6.5
         */
-#if 0
        if(uni_msg_len(msg) > mlen)
                msg->b_wptr = msg->b_rptr + mlen;
 #endif

Reply via email to