Date: Tue, 29 Mar 2011 16:21:01 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r220134 - projects/sv/sys/netinet Message-ID: <201103291621.p2TGL1S1033862@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Tue Mar 29 16:21:01 2011 New Revision: 220134 URL: http://svn.freebsd.org/changeset/base/220134 Log: More functions converted to style. Modified: projects/sv/sys/netinet/netdump_client.c Modified: projects/sv/sys/netinet/netdump_client.c ============================================================================== --- projects/sv/sys/netinet/netdump_client.c Tue Mar 29 16:08:51 2011 (r220133) +++ projects/sv/sys/netinet/netdump_client.c Tue Mar 29 16:21:01 2011 (r220134) @@ -895,8 +895,6 @@ NETDDEBUG("nd_handle_arp: ignoring ARP r } /* - * [netdump_pkt_in] - * * Handler for incoming packets directly from the network adapter * Identifies the packet type (IP or ARP) and passes it along to one of the * helper functions nd_handle_ip or nd_handle_arp. @@ -917,17 +915,19 @@ netdump_pkt_in(struct ifnet *ifp, struct struct ether_header *eh; u_short etype; - /* Ethernet processing */ + /* Ethernet processing. */ if ((m->m_flags & M_PKTHDR) == 0) { - NETDDEBUG_IF(ifp, "discard frame w/o packet header\n"); + NETDDEBUG_IF(ifp, + "netdump_pkt_in: Discard frame without packet header\n"); goto done; } if (m->m_len < ETHER_HDR_LEN) { - NETDDEBUG_IF(ifp, "discard frame w/o leading ethernet " - "header (len %u pkt len %u)\n", m->m_len, m->m_pkthdr.len); + NETDDEBUG_IF(ifp, +"netdump_pkt_in: Discard frame without leading eth header (len %u pktlen %u)\n", + m->m_len, m->m_pkthdr.len); goto done; } - if (m->m_flags & M_HASFCS) { + if ((m->m_flags & M_HASFCS) != 0) { m_adj(m, -ETHER_CRC_LEN); m->m_flags &= ~M_HASFCS; } @@ -935,13 +935,14 @@ netdump_pkt_in(struct ifnet *ifp, struct m->m_pkthdr.header = eh; etype = ntohs(eh->ether_type); if ((m->m_flags & M_VLANTAG) != 0 || etype == ETHERTYPE_VLAN) { - NETDDEBUG_IF(ifp, "ignoring vlan packets\n"); + NETDDEBUG_IF(ifp, "netdump_pkt_in: Ignoring vlan packets\n"); goto done; } - /* XXX: Probably should check if we're the recipient MAC address */ - /* Done ethernet processing. Strip off the ethernet header */ - m_adj(m, ETHER_HDR_LEN); + /* XXX: Probably must also check if we're the recipient MAC address. */ + + /* Done ethernet processing. Strip off the ethernet header. */ + m_adj(m, ETHER_HDR_LEN); switch (etype) { case ETHERTYPE_ARP: nd_handle_arp(&m); @@ -950,20 +951,19 @@ netdump_pkt_in(struct ifnet *ifp, struct nd_handle_ip(&m); break; default: - NETDDEBUG_IF(ifp, "dropping unknown ethertype %hu\n", + NETDDEBUG_IF(ifp, + "netdump_pkt_in: Dropping unknown ethertype %hu\n", etype); break; } - done: - if (m) m_freem(m); + if (m != NULL) + m_freem(m); } /* - * [netdump_network_poll] - * - * after trapping, instead of assuming that most of the network stack is sane - * just poll the driver directly for packets + * After trapping, instead of assuming that most of the network stack is sane + * just poll the driver directly for packets. * * Parameters: * void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103291621.p2TGL1S1033862>