From owner-svn-src-head@freebsd.org Tue Sep 1 21:19:23 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 95F963790F0; Tue, 1 Sep 2020 21:19:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0Lz3lNrz4Hjy; Tue, 1 Sep 2020 21:19:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6346E1FC75; Tue, 1 Sep 2020 21:19:23 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LJNx1018148; Tue, 1 Sep 2020 21:19:23 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LJERb018106; Tue, 1 Sep 2020 21:19:14 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012119.081LJERb018106@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:19:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph... X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgraph/bluetooth/drivers/bt3c n... X-SVN-Commit-Revision: 365071 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:19:23 -0000 Author: mjg Date: Tue Sep 1 21:19:14 2020 New Revision: 365071 URL: https://svnweb.freebsd.org/changeset/base/365071 Log: net: clean up empty lines in .c and .h files Modified: head/sys/net/altq/altq.h head/sys/net/altq/altq_cbq.c head/sys/net/altq/altq_cbq.h head/sys/net/altq/altq_codel.c head/sys/net/altq/altq_fairq.c head/sys/net/altq/altq_hfsc.c head/sys/net/altq/altq_hfsc.h head/sys/net/altq/altq_priq.c head/sys/net/altq/altq_priq.h head/sys/net/altq/altq_red.c head/sys/net/altq/altq_red.h head/sys/net/altq/altq_rio.c head/sys/net/altq/altq_rio.h head/sys/net/altq/altq_rmclass.c head/sys/net/altq/altq_subr.c head/sys/net/altq/if_altq.h head/sys/net/bpf.c head/sys/net/bridgestp.c head/sys/net/bridgestp.h head/sys/net/debugnet_inet.c head/sys/net/ieee8023ad_lacp.c head/sys/net/if.c head/sys/net/if.h head/sys/net/if_bridge.c head/sys/net/if_clone.c head/sys/net/if_dl.h head/sys/net/if_epair.c head/sys/net/if_ethersubr.c head/sys/net/if_gif.c head/sys/net/if_ipsec.c head/sys/net/if_lagg.c head/sys/net/if_llatbl.c head/sys/net/if_loop.c head/sys/net/if_media.c head/sys/net/if_media.h head/sys/net/if_mib.c head/sys/net/if_pfsync.h head/sys/net/if_spppsubr.c head/sys/net/if_tuntap.c head/sys/net/if_vlan.c head/sys/net/iflib.c head/sys/net/iflib.h head/sys/net/iflib_clone.c head/sys/net/ifq.h head/sys/net/mp_ring.c head/sys/net/netisr.c head/sys/net/netmap.h head/sys/net/netmap_legacy.h head/sys/net/netmap_user.h head/sys/net/pfvar.h head/sys/net/radix.c head/sys/net/radix_mpath.c head/sys/net/route.c head/sys/net/route/nhop.c head/sys/net/route/nhop.h head/sys/net/route/nhop_ctl.c head/sys/net/route/nhop_utils.c head/sys/net/route/nhop_utils.h head/sys/net/route/nhop_var.h head/sys/net/route/route_ctl.c head/sys/net/route/route_ctl.h head/sys/net/route/route_helpers.c head/sys/net/route/route_tables.c head/sys/net/route/route_temporal.c head/sys/net/route/route_var.h head/sys/net/rss_config.c head/sys/net/rtsock.c head/sys/net/sff8436.h head/sys/net/sff8472.h head/sys/net/slcompress.c head/sys/net/slcompress.h head/sys/net/vnet.h head/sys/net80211/ieee80211.h head/sys/net80211/ieee80211_action.c head/sys/net80211/ieee80211_ageq.c head/sys/net80211/ieee80211_crypto.c head/sys/net80211/ieee80211_crypto_tkip.c head/sys/net80211/ieee80211_freebsd.c head/sys/net80211/ieee80211_freebsd.h head/sys/net80211/ieee80211_hostap.c head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_hwmp.c head/sys/net80211/ieee80211_input.c head/sys/net80211/ieee80211_ioctl.c head/sys/net80211/ieee80211_ioctl.h head/sys/net80211/ieee80211_mesh.c head/sys/net80211/ieee80211_mesh.h head/sys/net80211/ieee80211_node.c head/sys/net80211/ieee80211_output.c head/sys/net80211/ieee80211_phy.c head/sys/net80211/ieee80211_power.c head/sys/net80211/ieee80211_proto.c head/sys/net80211/ieee80211_radiotap.c head/sys/net80211/ieee80211_radiotap.h head/sys/net80211/ieee80211_scan.c head/sys/net80211/ieee80211_scan_sta.c head/sys/net80211/ieee80211_scan_sw.c head/sys/net80211/ieee80211_sta.c head/sys/net80211/ieee80211_superg.c head/sys/net80211/ieee80211_tdma.h head/sys/net80211/ieee80211_vht.c head/sys/netgraph/atm/ccatm/ng_ccatm.c head/sys/netgraph/atm/ng_sscop.h head/sys/netgraph/atm/ngatmbase.c head/sys/netgraph/atm/sscfu/ng_sscfu.c head/sys/netgraph/atm/sscfu/ng_sscfu_cust.h head/sys/netgraph/atm/sscop/ng_sscop.c head/sys/netgraph/atm/sscop/ng_sscop_cust.h head/sys/netgraph/atm/uni/ng_uni.c head/sys/netgraph/bluetooth/common/ng_bluetooth.c head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h head/sys/netgraph/bluetooth/drivers/h4/ng_h4.c head/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h head/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c head/sys/netgraph/bluetooth/hci/ng_hci_cmds.c head/sys/netgraph/bluetooth/hci/ng_hci_cmds.h head/sys/netgraph/bluetooth/hci/ng_hci_evnt.c head/sys/netgraph/bluetooth/hci/ng_hci_evnt.h head/sys/netgraph/bluetooth/hci/ng_hci_main.c head/sys/netgraph/bluetooth/hci/ng_hci_misc.c head/sys/netgraph/bluetooth/hci/ng_hci_misc.h head/sys/netgraph/bluetooth/hci/ng_hci_prse.h head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h head/sys/netgraph/bluetooth/hci/ng_hci_var.h head/sys/netgraph/bluetooth/include/ng_bluetooth.h head/sys/netgraph/bluetooth/include/ng_bt3c.h head/sys/netgraph/bluetooth/include/ng_btsocket.h head/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h head/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h head/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h head/sys/netgraph/bluetooth/include/ng_btsocket_sco.h head/sys/netgraph/bluetooth/include/ng_h4.h head/sys/netgraph/bluetooth/include/ng_hci.h head/sys/netgraph/bluetooth/include/ng_l2cap.h head/sys/netgraph/bluetooth/include/ng_ubt.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c head/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h head/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h head/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c head/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c head/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c head/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c head/sys/netgraph/netflow/netflow.c head/sys/netgraph/netflow/netflow.h head/sys/netgraph/netflow/netflow_v9.c head/sys/netgraph/netflow/ng_netflow.c head/sys/netgraph/netflow/ng_netflow.h head/sys/netgraph/netgraph.h head/sys/netgraph/ng_UI.c head/sys/netgraph/ng_UI.h head/sys/netgraph/ng_async.c head/sys/netgraph/ng_base.c head/sys/netgraph/ng_bpf.c head/sys/netgraph/ng_bridge.c head/sys/netgraph/ng_bridge.h head/sys/netgraph/ng_car.c head/sys/netgraph/ng_checksum.c head/sys/netgraph/ng_cisco.c head/sys/netgraph/ng_cisco.h head/sys/netgraph/ng_deflate.c head/sys/netgraph/ng_deflate.h head/sys/netgraph/ng_device.c head/sys/netgraph/ng_echo.c head/sys/netgraph/ng_eiface.c head/sys/netgraph/ng_etf.c head/sys/netgraph/ng_ether.c head/sys/netgraph/ng_ether_echo.c head/sys/netgraph/ng_frame_relay.c head/sys/netgraph/ng_gif.c head/sys/netgraph/ng_hub.c head/sys/netgraph/ng_iface.c head/sys/netgraph/ng_ipfw.c head/sys/netgraph/ng_ksocket.c head/sys/netgraph/ng_l2tp.c head/sys/netgraph/ng_lmi.c head/sys/netgraph/ng_message.h head/sys/netgraph/ng_mppc.c head/sys/netgraph/ng_mppc.h head/sys/netgraph/ng_nat.c head/sys/netgraph/ng_one2many.h head/sys/netgraph/ng_parse.c head/sys/netgraph/ng_parse.h head/sys/netgraph/ng_patch.c head/sys/netgraph/ng_pipe.c head/sys/netgraph/ng_ppp.c head/sys/netgraph/ng_pppoe.c head/sys/netgraph/ng_pppoe.h head/sys/netgraph/ng_pptpgre.c head/sys/netgraph/ng_pred1.c head/sys/netgraph/ng_pred1.h head/sys/netgraph/ng_rfc1490.c head/sys/netgraph/ng_sample.c head/sys/netgraph/ng_socket.c head/sys/netgraph/ng_socket.h head/sys/netgraph/ng_split.c head/sys/netgraph/ng_split.h head/sys/netgraph/ng_sppp.c head/sys/netgraph/ng_tag.c head/sys/netgraph/ng_tcpmss.c head/sys/netgraph/ng_tcpmss.h head/sys/netgraph/ng_tty.c head/sys/netgraph/ng_vjc.c head/sys/netgraph/ng_vlan.c head/sys/netgraph/ng_vlan.h head/sys/netinet/accf_http.c head/sys/netinet/cc/cc_cubic.c head/sys/netinet/cc/cc_htcp.c head/sys/netinet/icmp_var.h head/sys/netinet/if_ether.c head/sys/netinet/igmp.c head/sys/netinet/in.c head/sys/netinet/in_fib.c head/sys/netinet/in_fib.h head/sys/netinet/in_gif.c head/sys/netinet/in_mcast.c head/sys/netinet/in_pcb.c head/sys/netinet/in_rmx.c head/sys/netinet/ip_carp.c head/sys/netinet/ip_dummynet.h head/sys/netinet/ip_fw.h head/sys/netinet/ip_icmp.c head/sys/netinet/ip_input.c head/sys/netinet/ip_mroute.c head/sys/netinet/ip_mroute.h head/sys/netinet/ip_options.c head/sys/netinet/ip_output.c head/sys/netinet/libalias/alias.c head/sys/netinet/libalias/alias.h head/sys/netinet/libalias/alias_db.c head/sys/netinet/libalias/alias_dummy.c head/sys/netinet/libalias/alias_ftp.c head/sys/netinet/libalias/alias_irc.c head/sys/netinet/libalias/alias_local.h head/sys/netinet/libalias/alias_nbt.c head/sys/netinet/libalias/alias_pptp.c head/sys/netinet/libalias/alias_proxy.c head/sys/netinet/libalias/alias_sctp.c head/sys/netinet/libalias/alias_sctp.h head/sys/netinet/libalias/alias_skinny.c head/sys/netinet/libalias/alias_smedia.c head/sys/netinet/libalias/alias_util.c head/sys/netinet/sctp.h head/sys/netinet/sctp_asconf.c head/sys/netinet/sctp_asconf.h head/sys/netinet/sctp_auth.c head/sys/netinet/sctp_auth.h head/sys/netinet/sctp_bsd_addr.c head/sys/netinet/sctp_bsd_addr.h head/sys/netinet/sctp_cc_functions.c head/sys/netinet/sctp_constants.h head/sys/netinet/sctp_header.h head/sys/netinet/sctp_indata.c head/sys/netinet/sctp_indata.h head/sys/netinet/sctp_input.c head/sys/netinet/sctp_input.h head/sys/netinet/sctp_lock_bsd.h head/sys/netinet/sctp_os.h head/sys/netinet/sctp_os_bsd.h head/sys/netinet/sctp_output.c head/sys/netinet/sctp_output.h head/sys/netinet/sctp_pcb.c head/sys/netinet/sctp_pcb.h head/sys/netinet/sctp_ss_functions.c head/sys/netinet/sctp_structs.h head/sys/netinet/sctp_sysctl.c head/sys/netinet/sctp_sysctl.h head/sys/netinet/sctp_timer.c head/sys/netinet/sctp_timer.h head/sys/netinet/sctp_uio.h head/sys/netinet/sctp_usrreq.c head/sys/netinet/sctp_var.h head/sys/netinet/sctputil.c head/sys/netinet/sctputil.h head/sys/netinet/siftr.c head/sys/netinet/tcp.h head/sys/netinet/tcp_fastopen.c head/sys/netinet/tcp_hpts.c head/sys/netinet/tcp_hpts.h head/sys/netinet/tcp_input.c head/sys/netinet/tcp_log_buf.c head/sys/netinet/tcp_log_buf.h head/sys/netinet/tcp_lro.c head/sys/netinet/tcp_output.c head/sys/netinet/tcp_ratelimit.c head/sys/netinet/tcp_reass.c head/sys/netinet/tcp_sack.c head/sys/netinet/tcp_stacks/bbr.c head/sys/netinet/tcp_stacks/rack.c head/sys/netinet/tcp_stacks/rack_bbr_common.c head/sys/netinet/tcp_stacks/tcp_bbr.h head/sys/netinet/tcp_stacks/tcp_rack.h head/sys/netinet/tcp_subr.c head/sys/netinet/tcp_syncache.c head/sys/netinet/tcp_usrreq.c head/sys/netinet/toecore.c head/sys/netinet/udp_usrreq.c head/sys/netinet6/frag6.c head/sys/netinet6/in6.c head/sys/netinet6/in6_cksum.c head/sys/netinet6/in6_fib.c head/sys/netinet6/in6_fib.h head/sys/netinet6/in6_mcast.c head/sys/netinet6/in6_rmx.c head/sys/netinet6/in6_src.c head/sys/netinet6/ip6_fastfwd.c head/sys/netinet6/ip6_input.c head/sys/netinet6/ip6_mroute.c head/sys/netinet6/ip6_output.c head/sys/netinet6/ip_fw_nptv6.h head/sys/netinet6/mld6.c head/sys/netinet6/nd6.c head/sys/netinet6/nd6_nbr.c head/sys/netinet6/nd6_rtr.c head/sys/netinet6/scope6.c head/sys/netinet6/sctp6_usrreq.c head/sys/netinet6/udp6_usrreq.c head/sys/netipsec/esp.h head/sys/netipsec/ipsec.c head/sys/netipsec/ipsec_input.c head/sys/netipsec/ipsec_output.c head/sys/netipsec/ipsec_pcb.c head/sys/netipsec/key.c head/sys/netipsec/key_debug.c head/sys/netipsec/udpencap.c head/sys/netpfil/ipfw/dn_aqm.h head/sys/netpfil/ipfw/dn_aqm_codel.c head/sys/netpfil/ipfw/dn_aqm_codel.h head/sys/netpfil/ipfw/dn_aqm_pie.c head/sys/netpfil/ipfw/dn_aqm_pie.h head/sys/netpfil/ipfw/dn_sched_fq_codel.c head/sys/netpfil/ipfw/dn_sched_fq_codel.h head/sys/netpfil/ipfw/dn_sched_fq_codel_helper.h head/sys/netpfil/ipfw/dn_sched_fq_pie.c head/sys/netpfil/ipfw/dn_sched_prio.c head/sys/netpfil/ipfw/dn_sched_qfq.c head/sys/netpfil/ipfw/dn_sched_rr.c head/sys/netpfil/ipfw/dn_sched_wf2q.c head/sys/netpfil/ipfw/ip_dn_glue.c head/sys/netpfil/ipfw/ip_dn_io.c head/sys/netpfil/ipfw/ip_dn_private.h head/sys/netpfil/ipfw/ip_dummynet.c head/sys/netpfil/ipfw/ip_fw2.c head/sys/netpfil/ipfw/ip_fw_bpf.c head/sys/netpfil/ipfw/ip_fw_dynamic.c head/sys/netpfil/ipfw/ip_fw_iface.c head/sys/netpfil/ipfw/ip_fw_nat.c head/sys/netpfil/ipfw/ip_fw_private.h head/sys/netpfil/ipfw/ip_fw_sockopt.c head/sys/netpfil/ipfw/ip_fw_table.c head/sys/netpfil/ipfw/ip_fw_table.h head/sys/netpfil/ipfw/ip_fw_table_algo.c head/sys/netpfil/ipfw/ip_fw_table_value.c head/sys/netpfil/ipfw/nat64/nat64_translate.c head/sys/netpfil/ipfw/nat64/nat64_translate.h head/sys/netpfil/ipfw/nat64/nat64clat_control.c head/sys/netpfil/ipfw/nat64/nat64lsn.c head/sys/netpfil/ipfw/nat64/nat64lsn_control.c head/sys/netpfil/ipfw/nat64/nat64stl.c head/sys/netpfil/ipfw/nat64/nat64stl.h head/sys/netpfil/ipfw/nat64/nat64stl_control.c head/sys/netpfil/ipfw/nptv6/nptv6.c head/sys/netpfil/ipfw/nptv6/nptv6.h head/sys/netpfil/ipfw/pmod/pmod.h head/sys/netpfil/ipfw/pmod/tcpmod.c head/sys/netpfil/ipfw/test/dn_test.h head/sys/netpfil/ipfw/test/main.c head/sys/netpfil/ipfw/test/mylist.h head/sys/netpfil/pf/if_pfsync.c head/sys/netpfil/pf/pf.c head/sys/netpfil/pf/pf_ioctl.c head/sys/netpfil/pf/pf_norm.c head/sys/netpfil/pf/pf_osfp.c head/sys/netpfil/pf/pf_ruleset.c head/sys/netpfil/pf/pf_table.c head/sys/netsmb/smb.h head/sys/netsmb/smb_conn.c head/sys/netsmb/smb_conn.h head/sys/netsmb/smb_crypt.c head/sys/netsmb/smb_dev.c head/sys/netsmb/smb_dev.h head/sys/netsmb/smb_iod.c head/sys/netsmb/smb_rq.c head/sys/netsmb/smb_rq.h head/sys/netsmb/smb_smb.c head/sys/netsmb/smb_subr.h head/sys/netsmb/smb_trantcp.c head/sys/netsmb/smb_trantcp.h Modified: head/sys/net/altq/altq.h ============================================================================== --- head/sys/net/altq/altq.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq.h Tue Sep 1 21:19:14 2020 (r365071) @@ -38,7 +38,6 @@ #define ALTQ3_CLFIER_COMPAT /* for compatibility with altq-3 classifier */ #endif - /* altq discipline type */ #define ALTQT_NONE 0 /* reserved */ #define ALTQT_CBQ 1 /* cbq */ @@ -57,14 +56,12 @@ #define ALTQT_CODEL 14 /* CoDel */ #define ALTQT_MAX 15 /* should be max discipline type + 1 */ - /* simple token backet meter profile */ struct tb_profile { u_int64_t rate; /* rate in bit-per-sec */ u_int32_t depth; /* depth in bytes */ }; - /* * generic packet counter */ @@ -76,7 +73,6 @@ struct pktcntr { #define PKTCNTR_ADD(cntr, len) \ do { (cntr)->packets++; (cntr)->bytes += len; } while (/*CONSTCOND*/ 0) - #ifdef _KERNEL #include #endif @@ -105,5 +101,5 @@ static inline int altq_stats_version(int scheduler) default: return (0); } } - + #endif /* _ALTQ_ALTQ_H_ */ Modified: head/sys/net/altq/altq_cbq.c ============================================================================== --- head/sys/net/altq/altq_cbq.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_cbq.c Tue Sep 1 21:19:14 2020 (r365071) @@ -55,7 +55,6 @@ #include #include - /* * Forward Declarations. */ Modified: head/sys/net/altq/altq_cbq.h ============================================================================== --- head/sys/net/altq/altq_cbq.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_cbq.h Tue Sep 1 21:19:14 2020 (r365071) @@ -111,7 +111,6 @@ typedef struct _cbq_class_stats_ { * header. */ - #ifdef _KERNEL /* * Define macros only good for kernel drivers and modules. @@ -121,7 +120,6 @@ typedef struct _cbq_class_stats_ { #define CBQ_LS_TIMEOUT (20 * hz / 1000) #define CBQ_MAX_CLASSES 256 - /* * Define State structures. Modified: head/sys/net/altq/altq_codel.c ============================================================================== --- head/sys/net/altq/altq_codel.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_codel.c Tue Sep 1 21:19:14 2020 (r365071) @@ -246,7 +246,6 @@ codel_dequeue(struct ifaltq *ifq, int op) if (op == ALTDQ_POLL) return (qhead(cif->cl_q)); - m = codel_getq(&cif->codel, cif->cl_q); if (m != NULL) { IFQ_DEC_LEN(ifq); Modified: head/sys/net/altq/altq_fairq.c ============================================================================== --- head/sys/net/altq/altq_fairq.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_fairq.c Tue Sep 1 21:19:14 2020 (r365071) @@ -157,7 +157,6 @@ fairq_add_altq(struct ifnet *ifp, struct pf_altq *a) if (!ALTQ_IS_READY(&ifp->if_snd)) return (ENODEV); - pif = malloc(sizeof(struct fairq_if), M_DEVBUF, M_WAITOK | M_ZERO); pif->pif_bandwidth = a->ifbandwidth; Modified: head/sys/net/altq/altq_hfsc.c ============================================================================== --- head/sys/net/altq/altq_hfsc.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_hfsc.c Tue Sep 1 21:19:14 2020 (r365071) @@ -133,8 +133,6 @@ static void get_class_stats_v1(struct hfsc_classsta struct hfsc_class *); static struct hfsc_class *clh_to_clp(struct hfsc_if *, u_int32_t); - - /* * macros */ @@ -142,7 +140,6 @@ static struct hfsc_class *clh_to_clp(struct hfsc_if *, #define HT_INFINITY 0xffffffffffffffffULL /* infinite time value */ - int hfsc_pfattach(struct pf_altq *a) { @@ -307,7 +304,6 @@ hfsc_clear_interface(struct hfsc_if *hif) { struct hfsc_class *cl; - /* clear out the classes */ while (hif->hif_rootclass != NULL && (cl = hif->hif_rootclass->cl_children) != NULL) { @@ -569,7 +565,6 @@ hfsc_class_destroy(struct hfsc_class *cl) s = splnet(); IFQ_LOCK(cl->cl_hif->hif_ifq); - if (!qempty(cl->cl_q)) hfsc_purgeq(cl); @@ -729,7 +724,6 @@ hfsc_dequeue(struct ifaltq *ifq, int op) cur_time = read_machclk(); if (op == ALTDQ_REMOVE && hif->hif_pollcache != NULL) { - cl = hif->hif_pollcache; hif->hif_pollcache = NULL; /* check if the class was scheduled by real-time criteria */ @@ -754,7 +748,6 @@ hfsc_dequeue(struct ifaltq *ifq, int op) */ cl = hif->hif_rootclass; while (is_a_parent_class(cl)) { - cl = actlist_firstfit(cl, cur_time); if (cl == NULL) { #ifdef ALTQ_DEBUG @@ -962,7 +955,6 @@ init_vf(struct hfsc_class *cl, int len) cur_time = 0; go_active = 1; for ( ; cl->cl_parent != NULL; cl = cl->cl_parent) { - if (go_active && cl->cl_nactive++ == 0) go_active = 1; else @@ -1052,7 +1044,6 @@ update_vf(struct hfsc_class *cl, int len, u_int64_t cu go_passive = qempty(cl->cl_q); for (; cl->cl_parent != NULL; cl = cl->cl_parent) { - cl->cl_total += len; if (cl->cl_fsc == NULL || cl->cl_nactive == 0) @@ -1596,7 +1587,7 @@ get_class_stats_v0(struct hfsc_classstats_v0 *sp, stru } #undef SATU32 - + sp->total = cl->cl_total; sp->cumul = cl->cl_cumul; @@ -1741,6 +1732,5 @@ clh_to_clp(struct hfsc_if *hif, u_int32_t chandle) return (cl); return (NULL); } - #endif /* ALTQ_HFSC */ Modified: head/sys/net/altq/altq_hfsc.h ============================================================================== --- head/sys/net/altq/altq_hfsc.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_hfsc.h Tue Sep 1 21:19:14 2020 (r365071) @@ -57,7 +57,7 @@ struct service_curve_v1 { /* Latest version of struct service_curve_vX */ #define HFSC_SERVICE_CURVE_VERSION 1 - + /* special class handles */ #define HFSC_NULLCLASS_HANDLE 0 #define HFSC_MAX_CLASSES 64 @@ -167,7 +167,6 @@ struct hfsc_classstats_v1 { * from mixing of public-API and internal bits in each scheduler-specific * header. */ - #ifdef _KERNEL /* Modified: head/sys/net/altq/altq_priq.c ============================================================================== --- head/sys/net/altq/altq_priq.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_priq.c Tue Sep 1 21:19:14 2020 (r365071) @@ -74,11 +74,9 @@ static struct mbuf *priq_getq(struct priq_class *); static struct mbuf *priq_pollq(struct priq_class *); static void priq_purgeq(struct priq_class *); - static void get_class_stats(struct priq_classstats *, struct priq_class *); static struct priq_class *clh_to_clp(struct priq_if *, u_int32_t); - int priq_pfattach(struct pf_altq *a) { @@ -639,6 +637,5 @@ clh_to_clp(struct priq_if *pif, u_int32_t chandle) return (NULL); } - #endif /* ALTQ_PRIQ */ Modified: head/sys/net/altq/altq_priq.h ============================================================================== --- head/sys/net/altq/altq_priq.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_priq.h Tue Sep 1 21:19:14 2020 (r365071) @@ -42,7 +42,6 @@ extern "C" { #define PRIQ_MAXPRI 16 /* upper limit of the number of priorities */ - /* priq class flags */ #define PRCF_RED 0x0001 /* use RED */ #define PRCF_ECN 0x0002 /* use RED/ECN */ @@ -54,7 +53,6 @@ extern "C" { /* special class handles */ #define PRIQ_NULLCLASS_HANDLE 0 - struct priq_classstats { u_int32_t class_handle; @@ -75,7 +73,6 @@ struct priq_classstats { * from mixing of public-API and internal bits in each scheduler-specific * header. */ - #ifdef _KERNEL Modified: head/sys/net/altq/altq_red.c ============================================================================== --- head/sys/net/altq/altq_red.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_red.c Tue Sep 1 21:19:14 2020 (r365071) @@ -162,13 +162,11 @@ * to switch to the random-drop policy, define "RED_RANDOM_DROP". */ - /* default red parameter values */ static int default_th_min = TH_MIN; static int default_th_max = TH_MAX; static int default_inv_pmax = INV_P_MAX; - /* * red support routines */ @@ -628,6 +626,5 @@ pow_w(struct wtab *w, int n) } return (val); } - #endif /* ALTQ_RED */ Modified: head/sys/net/altq/altq_red.h ============================================================================== --- head/sys/net/altq/altq_red.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_red.h Tue Sep 1 21:19:14 2020 (r365071) @@ -32,7 +32,6 @@ #include - /* red flags */ #define REDF_ECN4 0x01 /* use packet marking for IPv4 packets */ #define REDF_ECN6 0x02 /* use packet marking for IPv6 packets */ @@ -58,10 +57,8 @@ struct redstats { u_int marked_packets; }; - #ifdef _KERNEL - /* weight table structure for idle time calibration */ struct wtab { struct wtab *w_next; @@ -96,7 +93,6 @@ typedef struct red { struct wtab *red_wtab; /* weight table */ struct timeval red_last; /* time when the queue becomes idle */ - struct { struct pktcntr xmit_cnt; struct pktcntr drop_cnt; @@ -105,7 +101,6 @@ typedef struct red { u_int marked_packets; } red_stats; } red_t; - /* red drop types */ #define DTYPE_NODROP 0 /* no drop */ Modified: head/sys/net/altq/altq_rio.c ============================================================================== --- head/sys/net/altq/altq_rio.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_rio.c Tue Sep 1 21:19:14 2020 (r365071) @@ -447,5 +447,4 @@ rio_getq(rio_t *rp, class_queue_t *q) return (m); } - #endif /* ALTQ_RIO */ Modified: head/sys/net/altq/altq_rio.h ============================================================================== --- head/sys/net/altq/altq_rio.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_rio.h Tue Sep 1 21:19:14 2020 (r365071) @@ -38,14 +38,12 @@ */ #define RIO_NDROPPREC 3 /* number of drop precedence values */ - /* rio flags */ #define RIOF_ECN4 0x01 /* use packet marking for IPv4 packets */ #define RIOF_ECN6 0x02 /* use packet marking for IPv6 packets */ #define RIOF_ECN (RIOF_ECN4 | RIOF_ECN6) #define RIOF_CLEARDSCP 0x200 /* clear diffserv codepoint */ - #ifdef _KERNEL typedef struct rio { @@ -83,7 +81,6 @@ typedef struct rio { struct redstats q_stats[RIO_NDROPPREC]; /* statistics */ } rio_t; - extern rio_t *rio_alloc(int, struct redparams *, int, int); extern void rio_destroy(rio_t *); Modified: head/sys/net/altq/altq_rmclass.c ============================================================================== --- head/sys/net/altq/altq_rmclass.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_rmclass.c Tue Sep 1 21:19:14 2020 (r365071) @@ -64,7 +64,6 @@ /* * Local Macros */ - #define reset_cutoff(ifd) { ifd->cutoff_ = RM_MAXDEPTH; } /* @@ -651,7 +650,6 @@ rmc_delete_class(struct rm_ifdat *ifd, struct rm_class free(cl->q_, M_DEVBUF); free(cl, M_DEVBUF); } - /* * void Modified: head/sys/net/altq/altq_subr.c ============================================================================== --- head/sys/net/altq/altq_subr.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/altq_subr.c Tue Sep 1 21:19:14 2020 (r365071) @@ -243,7 +243,7 @@ altq_disable(ifq) ASSERT(ifq->ifq_len == 0); ifq->altq_flags &= ~(ALTQF_ENABLED|ALTQF_CLASSIFY); splx(s); - + IFQ_UNLOCK(ifq); return 0; } @@ -330,7 +330,7 @@ tbr_set(ifq, profile) struct tb_profile *profile; { struct tb_regulator *tbr, *otbr; - + if (tbr_dequeue_ptr == NULL) tbr_dequeue_ptr = tbr_dequeue; @@ -841,7 +841,6 @@ write_dsfield(struct mbuf *m, struct altq_pktattr *pkt return; } - /* * high resolution clock support taking advantage of a machine dependent * high resolution time counter (e.g., timestamp counter of intel pentium). @@ -1811,7 +1810,6 @@ filt2fibmask(filt) return (mask); } - /* * helper functions to handle IPv4 fragments. * currently only in-sequence fragments are handled. @@ -1831,7 +1829,6 @@ static TAILQ_HEAD(ip4f_list, ip4_frag) ip4f_list; /* I #define IP4F_TABSIZE 16 /* IPv4 fragment cache size */ - static void ip4f_cache(ip, fin) struct ip *ip; @@ -1871,7 +1868,6 @@ ip4f_lookup(ip, fin) ip->ip_src.s_addr == fp->ip4f_info.fi_src.s_addr && ip->ip_dst.s_addr == fp->ip4f_info.fi_dst.s_addr && ip->ip_p == fp->ip4f_info.fi_proto) { - /* found the matching entry */ fin->fi_sport = fp->ip4f_info.fi_sport; fin->fi_dport = fp->ip4f_info.fi_dport; Modified: head/sys/net/altq/if_altq.h ============================================================================== --- head/sys/net/altq/if_altq.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/altq/if_altq.h Tue Sep 1 21:19:14 2020 (r365071) @@ -74,7 +74,6 @@ struct ifaltq { struct top_cdnr *altq_cdnr; }; - #ifdef _KERNEL /* Modified: head/sys/net/bpf.c ============================================================================== --- head/sys/net/bpf.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/bpf.c Tue Sep 1 21:19:14 2020 (r365071) @@ -577,7 +577,6 @@ bpf_movein(struct uio *uio, int linktype, struct ifnet * for the link level header. */ switch (linktype) { - case DLT_SLIP: sockp->sa_family = AF_INET; hlen = 0; @@ -1428,7 +1427,6 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, i CURVNET_SET(TD_TO_VNET(td)); switch (cmd) { - default: error = EINVAL; break; Modified: head/sys/net/bridgestp.c ============================================================================== --- head/sys/net/bridgestp.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/bridgestp.c Tue Sep 1 21:19:14 2020 (r365071) @@ -832,7 +832,6 @@ bstp_assign_roles(struct bstp_state *bs) bp->bp_desg_fdelay = bs->bs_root_fdelay; bp->bp_desg_htime = bs->bs_bridge_htime; - switch (bp->bp_infois) { case BSTP_INFO_DISABLED: bstp_set_port_role(bp, BSTP_ROLE_DISABLED); Modified: head/sys/net/bridgestp.h ============================================================================== --- head/sys/net/bridgestp.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/bridgestp.h Tue Sep 1 21:19:14 2020 (r365071) @@ -178,7 +178,6 @@ #define BSTP_INFO_AGED 3 #define BSTP_INFO_DISABLED 4 - #define BSTP_MESSAGE_AGE_INCR (1 * 256) /* in 256ths of a second */ #define BSTP_TICK_VAL (1 * 256) /* in 256ths of a second */ #define BSTP_LINK_TIMER (BSTP_TICK_VAL * 15) Modified: head/sys/net/debugnet_inet.c ============================================================================== --- head/sys/net/debugnet_inet.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/debugnet_inet.c Tue Sep 1 21:19:14 2020 (r365071) @@ -161,7 +161,6 @@ debugnet_handle_ip(struct debugnet_pcb *pcb, struct mb return; } if (m->m_pkthdr.len > ip->ip_len) { - /* Truncate the packet to the IP length. */ if (m->m_len == m->m_pkthdr.len) { m->m_len = ip->ip_len; Modified: head/sys/net/ieee8023ad_lacp.c ============================================================================== --- head/sys/net/ieee8023ad_lacp.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/ieee8023ad_lacp.c Tue Sep 1 21:19:14 2020 (r365071) @@ -206,7 +206,6 @@ VNET_DEFINE_STATIC(int, lacp_default_strict_mode) = 1; SYSCTL_INT(_net_link_lagg_lacp, OID_AUTO, default_strict_mode, CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(lacp_default_strict_mode), 0, "LACP strict protocol compliance default"); - #define LACP_DPRINTF(a) if (V_lacp_debug & 0x01) { lacp_dprintf a ; } #define LACP_TRACE(a) if (V_lacp_debug & 0x02) { lacp_dprintf(a,"%s\n",__func__); } #define LACP_TPRINTF(a) if (V_lacp_debug & 0x04) { lacp_dprintf a ; } @@ -607,7 +606,7 @@ lacp_req(struct lagg_softc *sc, void *data) struct lacp_aggregator *la; bzero(req, sizeof(struct lacp_opreq)); - + /* * If the LACP softc is NULL, return with the opreq structure full of * zeros. It is normal for the softc to be NULL while the lagg is @@ -1102,7 +1101,6 @@ lacp_compose_key(struct lacp_port *lp) uint16_t key; if ((lp->lp_state & LACP_STATE_AGGREGATION) == 0) { - /* * non-aggregatable links should have unique keys. * @@ -1677,7 +1675,6 @@ lacp_sm_ptx_tx_schedule(struct lacp_port *lp) if (!(lp->lp_state & LACP_STATE_ACTIVITY) && !(lp->lp_partner.lip_state & LACP_STATE_ACTIVITY)) { - /* * NO_PERIODIC */ Modified: head/sys/net/if.c ============================================================================== --- head/sys/net/if.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if.c Tue Sep 1 21:19:14 2020 (r365071) @@ -488,7 +488,6 @@ VNET_SYSUNINIT(vnet_if_return, SI_SUB_VNET_DONE, SI_OR vnet_if_return, NULL); #endif - static void * if_grow(void) { @@ -688,7 +687,7 @@ if_rele(struct ifnet *ifp) void ifq_init(struct ifaltq *ifq, struct ifnet *ifp) { - + mtx_init(&ifq->ifq_mtx, ifp->if_xname, "if send queue", MTX_DEF); if (ifq->ifq_maxlen == 0) @@ -1838,7 +1837,6 @@ ifa_free(struct ifaddr *ifa) NET_EPOCH_CALL(ifa_destroy, &ifa->ifa_epoch_ctx); } - static int ifa_maintain_loopback_route(int cmd, const char *otype, struct ifaddr *ifa, struct sockaddr *ia) @@ -2358,7 +2356,7 @@ if_qflush(struct ifnet *ifp) { struct mbuf *m, *n; struct ifaltq *ifq; - + ifq = &ifp->if_snd; IFQ_LOCK(ifq); #ifdef ALTQ @@ -3142,7 +3140,7 @@ if_setflag(struct ifnet *ifp, int flag, int pflag, int /* Save ifnet parameters for if_ioctl() may fail */ oldcount = *refcount; oldflags = ifp->if_flags; - + /* * See if we aren't the only and touching refcount is enough. * Actually toggle interface flag if we are the first or last. @@ -3430,7 +3428,6 @@ if_freemulti(struct ifmultiaddr *ifma) NET_EPOCH_CALL(if_destroymulti, &ifma->ifma_epoch_ctx); } - /* * Register an additional multicast address with a network interface. * @@ -4029,7 +4026,7 @@ void if_register_com_alloc(u_char type, if_com_alloc_t *a, if_com_free_t *f) { - + KASSERT(if_com_alloc[type] == NULL, ("if_register_com_alloc: %d already registered", type)); KASSERT(if_com_free[type] == NULL, @@ -4042,7 +4039,7 @@ if_register_com_alloc(u_char type, void if_deregister_com_alloc(u_char type) { - + KASSERT(if_com_alloc[type] != NULL, ("if_deregister_com_alloc: %d not registered", type)); KASSERT(if_com_free[type] != NULL, @@ -4154,7 +4151,7 @@ if_getdrvflags(if_t ifp) { return ((struct ifnet *)ifp)->if_drv_flags; } - + int if_setdrvflags(if_t ifp, int flags) { @@ -4162,7 +4159,6 @@ if_setdrvflags(if_t ifp, int flags) return (0); } - int if_setflags(if_t ifp, int flags) { @@ -4376,7 +4372,6 @@ if_getamcount(if_t ifp) return ((struct ifnet *)ifp)->if_amcount; } - int if_setsendqready(if_t ifp) { @@ -4537,7 +4532,7 @@ if_settransmitfn(if_t ifp, if_transmit_fn_t start_fn) void if_setqflushfn(if_t ifp, if_qflush_fn_t flush_fn) { ((struct ifnet *)ifp)->if_qflush = flush_fn; - + } void Modified: head/sys/net/if.h ============================================================================== --- head/sys/net/if.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if.h Tue Sep 1 21:19:14 2020 (r365071) @@ -164,7 +164,6 @@ struct if_data { #define IFF_RENAMING 0x400000 /* (n) interface is being renamed */ #define IFF_NOGROUP 0x800000 /* (n) interface is not part of any groups */ - /* * Old names for driver flags so that user space tools can continue to use * the old (portable) names. Modified: head/sys/net/if_bridge.c ============================================================================== --- head/sys/net/if_bridge.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_bridge.c Tue Sep 1 21:19:14 2020 (r365071) @@ -364,7 +364,6 @@ static int bridge_fragment(struct ifnet *, struct mbuf static void bridge_linkstate(struct ifnet *ifp); static void bridge_linkcheck(struct bridge_softc *sc); - /* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */ #define VLANTAGOF(_m) \ (_m->m_flags & M_VLANTAG) ? EVL_VLANOFTAG(_m->m_pkthdr.ether_vtag) : 1 @@ -784,7 +783,6 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t da NET_EPOCH_ENTER(et); switch (cmd) { - case SIOCADDMULTI: case SIOCDELMULTI: break; Modified: head/sys/net/if_clone.c ============================================================================== --- head/sys/net/if_clone.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_clone.c Tue Sep 1 21:19:14 2020 (r365071) @@ -239,7 +239,7 @@ if_clone_createif(struct if_clone *ifc, char *name, si err = ifc_simple_create(ifc, name, len, params); else err = (*ifc->ifc_create)(ifc, name, len, params); - + if (!err) { ifp = ifunit(name); if (ifp == NULL) @@ -669,7 +669,7 @@ ifc_simple_match(struct if_clone *ifc, const char *nam { const char *cp; int i; - + /* Match the name */ for (cp = name, i = 0; i < strlen(ifc->ifc_name); i++, cp++) { if (ifc->ifc_name[i] != *cp) @@ -721,7 +721,6 @@ ifc_simple_create(struct if_clone *ifc, char *name, si */ panic("if_clone_create(): interface name too long"); } - } return (0); Modified: head/sys/net/if_dl.h ============================================================================== --- head/sys/net/if_dl.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_dl.h Tue Sep 1 21:19:14 2020 (r365071) @@ -72,7 +72,6 @@ struct sockaddr_dl { #define CLLADDR(s) ((c_caddr_t)((s)->sdl_data + (s)->sdl_nlen)) #define LLINDEX(s) ((s)->sdl_index) - struct ifnet; struct sockaddr_dl *link_alloc_sdl(size_t, int); void link_free_sdl(struct sockaddr *sa); Modified: head/sys/net/if_epair.c ============================================================================== --- head/sys/net/if_epair.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_epair.c Tue Sep 1 21:19:14 2020 (r365071) @@ -489,7 +489,7 @@ epair_transmit_locked(struct ifnet *ifp, struct mbuf * if (m == NULL) return (0); - + /* * We are not going to use the interface en/dequeue mechanism * on the TX side. We are called from ether_output_frame() @@ -609,7 +609,7 @@ static void epair_qflush(struct ifnet *ifp) { struct epair_softc *sc; - + sc = ifp->if_softc; KASSERT(sc != NULL, ("%s: ifp=%p, epair_softc gone? sc=%p\n", __func__, ifp, sc)); @@ -681,7 +681,6 @@ epair_init(void *dummy __unused) { } - /* * Interface cloning functions. * We use our private ones so that we can create/destroy our secondary @@ -800,7 +799,7 @@ epair_clone_create(struct if_clone *ifc, char *name, s ifc_free_unit(ifc, unit); return (ENOSPC); } - + /* * Cross-reference the interfaces so we will be able to free both. */ @@ -825,7 +824,7 @@ epair_clone_create(struct if_clone *ifc, char *name, s ifmedia_init(&scb->media, 0, epair_media_change, epair_media_status); ifmedia_add(&scb->media, IFM_ETHER | IFM_10G_T, 0, NULL); ifmedia_set(&scb->media, IFM_ETHER | IFM_10G_T); - + /* Finish initialization of interface a. */ ifp = sca->ifp; ifp->if_softc = sca; @@ -932,7 +931,7 @@ epair_clone_destroy(struct if_clone *ifc, struct ifnet */ if (ifp->if_softc == NULL) return (0); - + unit = ifp->if_dunit; sca = ifp->if_softc; oifp = sca->oifp; Modified: head/sys/net/if_ethersubr.c ============================================================================== --- head/sys/net/if_ethersubr.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_ethersubr.c Tue Sep 1 21:19:14 2020 (r365071) @@ -122,7 +122,6 @@ static void ether_reassign(struct ifnet *, struct vnet #endif static int ether_requestencap(struct ifnet *, struct if_encap_req *); - #define senderr(e) do { error = (e); goto bad;} while (0) static void @@ -200,7 +199,6 @@ ether_requestencap(struct ifnet *ifp, struct if_encap_ return (0); } - static int ether_resolve_addr(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro, u_char *phdr, @@ -545,7 +543,6 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m /* draft-ietf-6man-ipv6only-flag */ /* Catch ETHERTYPE_IP, and ETHERTYPE_[REV]ARP if we are v6-only. */ if ((ND_IFINFO(ifp)->flags & ND6_IFF_IPV6_ONLY_MASK) != 0) { - switch (etype) { case ETHERTYPE_IP: case ETHERTYPE_ARP: @@ -774,7 +771,7 @@ vnet_ether_init(__unused void *arg) } VNET_SYSINIT(vnet_ether_init, SI_SUB_PROTO_IF, SI_ORDER_ANY, vnet_ether_init, NULL); - + #ifdef VIMAGE static void vnet_ether_pfil_destroy(__unused void *arg) @@ -794,8 +791,6 @@ vnet_ether_destroy(__unused void *arg) VNET_SYSUNINIT(vnet_ether_uninit, SI_SUB_PROTO_IF, SI_ORDER_ANY, vnet_ether_destroy, NULL); #endif - - static void ether_input(struct ifnet *ifp, struct mbuf *m) Modified: head/sys/net/if_gif.c ============================================================================== --- head/sys/net/if_gif.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_gif.c Tue Sep 1 21:19:14 2020 (r365071) @@ -400,7 +400,6 @@ gif_qflush(struct ifnet *ifp __unused) } - int gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro) @@ -721,4 +720,3 @@ gif_delete_tunnel(struct gif_softc *sc) GIF2IFP(sc)->if_drv_flags &= ~IFF_DRV_RUNNING; if_link_state_change(GIF2IFP(sc), LINK_STATE_DOWN); } - Modified: head/sys/net/if_ipsec.c ============================================================================== --- head/sys/net/if_ipsec.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_ipsec.c Tue Sep 1 21:19:14 2020 (r365071) @@ -1003,7 +1003,6 @@ ipsec_set_addresses(struct ifnet *ifp, struct sockaddr key_sockaddrcmp(&saidx->src.sa, src, 0) == 0 && key_sockaddrcmp(&saidx->dst.sa, dst, 0) == 0) return (0); /* Nothing has been changed. */ - } /* If reqid is not set, generate new one. */ if (ipsec_init_reqid(sc) != 0) Modified: head/sys/net/if_lagg.c ============================================================================== --- head/sys/net/if_lagg.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_lagg.c Tue Sep 1 21:19:14 2020 (r365071) @@ -803,7 +803,6 @@ lagg_port_create(struct lagg_softc *sc, struct ifnet * lagg_setmulti(lp); - if ((error = lagg_proto_addport(sc, lp)) != 0) { /* Remove the port, without calling pr_delport. */ lagg_port_destroy(lp, 0); @@ -1046,7 +1045,6 @@ lagg_get_counter(struct ifnet *ifp, ift_counter cnt) */ vsum += sc->detached_counters.val[cnt]; - return (vsum); } @@ -2425,4 +2423,3 @@ lagg_lacp_input(struct lagg_softc *sc, struct lagg_por m->m_pkthdr.rcvif = ifp; return (m); } - Modified: head/sys/net/if_llatbl.c ============================================================================== --- head/sys/net/if_llatbl.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_llatbl.c Tue Sep 1 21:19:14 2020 (r365071) @@ -874,7 +874,6 @@ llatbl_llt_show(struct lltable *llt) for (i = 0; i < llt->llt_hsize; i++) { CK_LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { - llatbl_lle_show((struct llentry_sa *)lle); if (db_pager_quit) return; Modified: head/sys/net/if_loop.c ============================================================================== --- head/sys/net/if_loop.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_loop.c Tue Sep 1 21:19:14 2020 (r365071) @@ -393,7 +393,6 @@ loioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } switch (ifr->ifr_addr.sa_family) { - #ifdef INET case AF_INET: break; Modified: head/sys/net/if_media.c ============================================================================== --- head/sys/net/if_media.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_media.c Tue Sep 1 21:19:14 2020 (r365071) @@ -233,7 +233,6 @@ ifmedia_ioctl(ifp, ifr, ifm, cmd) return(EINVAL); switch (cmd) { - /* * Set the current media. */ @@ -390,7 +389,7 @@ ifmedia_baudrate(int mword) /* Not known. */ return (0); } - + #ifdef IFMEDIA_DEBUG static const struct ifmedia_description ifm_type_descriptions[] = IFM_TYPE_DESCRIPTIONS; Modified: head/sys/net/if_media.h ============================================================================== --- head/sys/net/if_media.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_media.h Tue Sep 1 21:19:14 2020 (r365071) @@ -108,7 +108,6 @@ void ifmedia_set(struct ifmedia *ifm, int mword); int ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm, u_long cmd); - /* Compute baudrate for a given media. */ uint64_t ifmedia_baudrate(int); Modified: head/sys/net/if_mib.c ============================================================================== --- head/sys/net/if_mib.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_mib.c Tue Sep 1 21:19:14 2020 (r365071) @@ -150,4 +150,3 @@ out: static SYSCTL_NODE(_net_link_generic, IFMIB_IFDATA, ifdata, CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ifdata, "Interface table"); - Modified: head/sys/net/if_pfsync.h ============================================================================== --- head/sys/net/if_pfsync.h Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_pfsync.h Tue Sep 1 21:19:14 2020 (r365071) @@ -47,7 +47,6 @@ * $FreeBSD$ */ - #ifndef _NET_IF_PFSYNC_H_ #define _NET_IF_PFSYNC_H_ Modified: head/sys/net/if_spppsubr.c ============================================================================== --- head/sys/net/if_spppsubr.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_spppsubr.c Tue Sep 1 21:19:14 2020 (r365071) @@ -742,7 +742,7 @@ static void sppp_ifstart_sched(void *dummy) { struct sppp *sp = dummy; - + sp->if_start(SP2IFP(sp)); } @@ -1005,7 +1005,7 @@ sppp_attach(struct ifnet *ifp) /* Initialize mtx lock */ mtx_init(&sp->mtx, "sppp", MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); - + /* Initialize keepalive handler. */ callout_init(&sp->keepalive_callout, 1); callout_reset(&sp->keepalive_callout, hz * 10, sppp_keepalive, @@ -1863,7 +1863,6 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, st } } - /* * The generic part of all Up/Down/Open/Close/TO event handlers. * Basically, the state transition handling in the automaton. @@ -1930,7 +1929,6 @@ sppp_down_event(const struct cp *cp, struct sppp *sp) } } - static void sppp_open_event(const struct cp *cp, struct sppp *sp) { @@ -1980,7 +1978,6 @@ sppp_open_event(const struct cp *cp, struct sppp *sp) } } - static void sppp_close_event(const struct cp *cp, struct sppp *sp) { @@ -2680,7 +2677,7 @@ sppp_lcp_tlu(struct sppp *sp) /* notify low-level driver of state change */ if (sp->pp_chg) sp->pp_chg(sp, (int)sp->pp_phase); - + if (sp->pp_phase == PHASE_NETWORK) /* if no NCP is starting, close down */ sppp_lcp_check_and_close(sp); @@ -3070,7 +3067,6 @@ sppp_ipcp_RCR(struct sppp *sp, struct lcp_header *h, i else log(-1, "%s [not agreed] ", sppp_dotted_quad(desiredaddr)); - } p[2] = hisaddr >> 24; p[3] = hisaddr >> 16; @@ -3836,7 +3832,6 @@ static void sppp_ipv6cp_down(struct sppp *sp) { } - static void sppp_ipv6cp_open(struct sppp *sp) { } @@ -4188,7 +4183,6 @@ sppp_chap_input(struct sppp *sp, struct mbuf *m) log(-1, ">\n"); } break; - } } @@ -4506,7 +4500,6 @@ sppp_pap_input(struct sppp *sp, struct mbuf *m) log(-1, ">\n"); } break; - } } @@ -5227,7 +5220,6 @@ sppp_phase_network(struct sppp *sp) /* if no NCP is starting, all this was in vain, close down */ sppp_lcp_check_and_close(sp); } - static const char * sppp_cp_type_name(u_char type) Modified: head/sys/net/if_tuntap.c ============================================================================== --- head/sys/net/if_tuntap.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_tuntap.c Tue Sep 1 21:19:14 2020 (r365071) @@ -168,7 +168,6 @@ struct tuntap_softc { #define TAP_ALL_OFFLOAD (CSUM_TSO | CSUM_TCP | CSUM_UDP |\ CSUM_TCP_IPV6 | CSUM_UDP_IPV6) - /* * All mutable global variables in if_tun are locked using tunmtx, with * the exception of tundebug, which is used unlocked, and the drivers' *clones, @@ -387,7 +386,6 @@ tun_busy(struct tuntap_softc *tp) return (ret); } - static void tun_unbusy(struct tuntap_softc *tp) { @@ -475,8 +473,6 @@ tuntap_driver_from_flags(int tun_flags) return (NULL); } - - static int tun_clone_match(struct if_clone *ifc, const char *name) Modified: head/sys/net/if_vlan.c ============================================================================== --- head/sys/net/if_vlan.c Tue Sep 1 21:18:40 2020 (r365070) +++ head/sys/net/if_vlan.c Tue Sep 1 21:19:14 2020 (r365071) @@ -342,7 +342,7 @@ static void *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***