The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=123342f3d2cccf432d3d0082097b6c97397ecc67

commit 123342f3d2cccf432d3d0082097b6c97397ecc67
Author:     Mark Johnston <[email protected]>
AuthorDate: 2026-09-29 19:16:37 +0000
Commit:     Mark Johnston <[email protected]>
CommitDate: 2026-09-29 19:23:15 +0000

    igmp: Deindent some code
    
    No functional change intended.
    
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
---
 sys/netinet/igmp.c | 67 +++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 5ca5a4575026..8c09a37963bd 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1577,43 +1577,42 @@ igmp_input(struct mbuf **mp, int *offp, int proto)
                        break;
 
                case IGMP_VERSION_3: {
-                               struct igmpv3 *igmpv3;
-                               uint16_t igmpv3len;
-                               uint16_t nsrc;
-
-                               IGMPSTAT_INC(igps_rcv_v3_queries);
-                               igmpv3 = (struct igmpv3 *)igmp;
-                               /*
-                                * Validate length based on source count.
-                                */
-                               nsrc = ntohs(igmpv3->igmp_numsrc);
-                               if (nsrc * sizeof(in_addr_t) >
-                                   UINT16_MAX - iphlen - IGMP_V3_QUERY_MINLEN) 
{
-                                       IGMPSTAT_INC(igps_rcv_tooshort);
-                                       m_freem(m);
-                                       return (IPPROTO_DONE);
-                               }
-                               /*
-                                * m_pullup() may modify m, so pullup in
-                                * this scope.
-                                */
-                               igmpv3len = iphlen + IGMP_V3_QUERY_MINLEN +
-                                  sizeof(struct in_addr) * nsrc;
-                               if ((!M_WRITABLE(m) ||
-                                    m->m_len < igmpv3len) &&
-                                   (m = m_pullup(m, igmpv3len)) == NULL) {
-                                       IGMPSTAT_INC(igps_rcv_tooshort);
-                                       return (IPPROTO_DONE);
-                               }
-                               igmpv3 = (struct igmpv3 *)(mtod(m, uint8_t *)
-                                   + iphlen);
-                               if (igmp_input_v3_query(ifp, ip, igmpv3) != 0) {
-                                       m_freem(m);
-                                       return (IPPROTO_DONE);
-                               }
+                       struct igmpv3 *igmpv3;
+                       uint16_t igmpv3len;
+                       uint16_t nsrc;
+
+                       IGMPSTAT_INC(igps_rcv_v3_queries);
+                       igmpv3 = (struct igmpv3 *)igmp;
+                       /*
+                        * Validate length based on source count.
+                        */
+                       nsrc = ntohs(igmpv3->igmp_numsrc);
+                       if (nsrc * sizeof(in_addr_t) >
+                           UINT16_MAX - iphlen - IGMP_V3_QUERY_MINLEN) {
+                               IGMPSTAT_INC(igps_rcv_tooshort);
+                               m_freem(m);
+                               return (IPPROTO_DONE);
+                       }
+                       /*
+                        * m_pullup() may modify m, so pullup in
+                        * this scope.
+                        */
+                       igmpv3len = iphlen + IGMP_V3_QUERY_MINLEN +
+                          sizeof(struct in_addr) * nsrc;
+                       if ((!M_WRITABLE(m) ||
+                            m->m_len < igmpv3len) &&
+                           (m = m_pullup(m, igmpv3len)) == NULL) {
+                               IGMPSTAT_INC(igps_rcv_tooshort);
+                               return (IPPROTO_DONE);
+                       }
+                       igmpv3 = (struct igmpv3 *)(mtod(m, uint8_t *) + iphlen);
+                       if (igmp_input_v3_query(ifp, ip, igmpv3) != 0) {
+                               m_freem(m);
+                               return (IPPROTO_DONE);
                        }
                        break;
                }
+               }
                break;
 
        case IGMP_v1_HOST_MEMBERSHIP_REPORT:

Reply via email to