From: Aaron LI Date: Thu, 21 Jun 2018 05:56:00 +0000 (+0800) Subject: net: Tweak some styles and comments X-Git-Tag: v5.5.0~289 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/2949c680adb831996c4c170affac4f493c3de188 net: Tweak some styles and comments --- diff --git a/sys/net/if.c b/sys/net/if.c index a97cd7f40c..fdb7db80cd 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -164,8 +164,8 @@ SYSCTL_INT(_net_link_ringmap, OID_AUTO, dump_rdr, CTLFLAG_RW, SYSINIT(interfaces, SI_SUB_PROTO_IF, SI_ORDER_FIRST, ifinit, NULL); SYSINIT(ifnet, SI_SUB_PRE_DRIVERS, SI_ORDER_ANY, ifnetinit, NULL); -static if_com_alloc_t *if_com_alloc[256]; -static if_com_free_t *if_com_free[256]; +static if_com_alloc_t *if_com_alloc[256]; +static if_com_free_t *if_com_free[256]; MALLOC_DEFINE(M_IFADDR, "ifaddr", "interface address"); MALLOC_DEFINE(M_IFMADDR, "ether_multi", "link-level multicast address"); @@ -190,7 +190,7 @@ static struct ifsubq_stage_head ifsubq_stage_heads[MAXCPU]; #ifdef notyet #define IFQ_KTR_STRING "ifq=%p" -#define IFQ_KTR_ARGS struct ifaltq *ifq +#define IFQ_KTR_ARGS struct ifaltq *ifq #ifndef KTR_IFQ #define KTR_IFQ KTR_ALL #endif @@ -224,7 +224,7 @@ KTR_INFO(KTR_IF_START, if_start, chase_sched, 4, * Routines with ifa_ifwith* names take sockaddr *'s as * parameters. */ -/* ARGSUSED*/ +/* ARGSUSED */ static void ifinit(void *dummy) { @@ -1046,10 +1046,11 @@ if_detach(struct ifnet *ifp) msg.ifp = ifp; netisr_domsg_global(&msg.base); - SLIST_FOREACH(dp, &domains, dom_next) + SLIST_FOREACH(dp, &domains, dom_next) { if (dp->dom_ifdetach && ifp->if_afdata[dp->dom_family]) (*dp->dom_ifdetach)(ifp, ifp->if_afdata[dp->dom_family]); + } kfree(ifp->if_addrheads, M_IFADDR); @@ -2863,7 +2864,7 @@ if_printf(struct ifnet *ifp, const char *fmt, ...) struct ifnet * if_alloc(uint8_t type) { - struct ifnet *ifp; + struct ifnet *ifp; size_t size; /* diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 70883c5386..06f79303ac 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -184,11 +184,11 @@ enum ifnet_serialize { * Caller of if_output MUST NOT serialize ifnet or if_snd by calling * the related serialize functions. * - * For better tranmission performance, driver should setup if_snd subqueue - * owner cpuid properly using ifsq_set_cpuid() (or ifq_set_cpuid(), if not - * multiple transmit queue capable). Normally, the if_snd subqueue owner - * cpu is the one that processing the transmission interrupt. And in driver, - * direct call of if_start should be avoided, use ifsq_devstart() or + * For better transmission performance, driver should setup if_snd subqueue + * owner's cpuid properly using ifsq_set_cpuid() (or ifq_set_cpuid(), if not + * multiple transmit queue capable). Normally, the if_snd subqueue owner's + * cpu is the one that processing the transmission interruption. And in + * driver, direct call of if_start should be avoided, use ifsq_devstart() or * ifsq_devstart_sched() instead (or if_devstart()/if_devstart_sched(), if * not multiple transmit queue capable). * @@ -317,7 +317,8 @@ struct ifnet { void *if_softc; /* pointer to driver state */ void *if_l2com; /* pointer to protocol bits */ TAILQ_ENTRY(ifnet) if_link; /* all struct ifnets are chained */ - char if_xname[IFNAMSIZ]; /* external name (name + unit) */ + char if_xname[IFNAMSIZ]; /* external name (name + unit); + * can be renamed (SIOCSIFNAME) */ const char *if_dname; /* driver name */ int if_dunit; /* unit or IF_DUNIT_NONE */ void *if_vlantrunks; /* vlan trunks */ @@ -516,10 +517,6 @@ struct ifdata_pcpu { #ifdef _KERNEL -/* interface link layer address change event */ -typedef void (*iflladdr_event_handler_t)(void *, struct ifnet *); -EVENTHANDLER_DECLARE(iflladdr_event, iflladdr_event_handler_t); - #ifdef INVARIANTS #define ASSERT_IFNET_SERIALIZED_ALL(ifp) \ (ifp)->if_serialize_assert((ifp), IFNET_SERIALIZE_ALL, TRUE) @@ -700,9 +697,6 @@ do { \ (v) += (ifp)->if_data_pcpu[_cpu].ifd_##name; \ } while (0) -#ifndef _SYS_SERIALIZE2_H_ -#include -#endif enum ifaddr_event { IFADDR_EVENT_ADD, @@ -714,6 +708,9 @@ enum ifaddr_event { typedef void (*ifaddr_event_handler_t)(void *, struct ifnet *, enum ifaddr_event, struct ifaddr *); EVENTHANDLER_DECLARE(ifaddr_event, ifaddr_event_handler_t); +/* interface link layer address change event */ +typedef void (*iflladdr_event_handler_t)(void *, struct ifnet *); +EVENTHANDLER_DECLARE(iflladdr_event, iflladdr_event_handler_t); /* new interface attach event */ typedef void (*ifnet_attach_event_handler_t)(void *, struct ifnet *); EVENTHANDLER_DECLARE(ifnet_attach_event, ifnet_attach_event_handler_t); @@ -788,6 +785,7 @@ IFAREF(struct ifaddr *_ifa) } #include +#include MALLOC_DECLARE(M_IFADDR); MALLOC_DECLARE(M_IFMADDR); @@ -896,8 +894,8 @@ struct ifnet *ifunit_netisr(const char *); const struct ifnet_array *ifnet_array_get(void); int ifnet_array_isempty(void); -extern int ifqmaxlen; -extern struct ifnet *loif; +extern int ifqmaxlen; +extern struct ifnet *loif; /* first loopback interface */ extern struct ifgrouphead ifg_head; struct ip; @@ -957,8 +955,8 @@ struct ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *); typedef void *if_com_alloc_t(u_char type, struct ifnet *ifp); typedef void if_com_free_t(void *com, u_char type); -void if_register_com_alloc(u_char, if_com_alloc_t *a, if_com_free_t *); -void if_deregister_com_alloc(u_char); +void if_register_com_alloc(u_char, if_com_alloc_t *a, if_com_free_t *); +void if_deregister_com_alloc(u_char); void *ifa_create(int); void ifa_destroy(struct ifaddr *); diff --git a/sys/net/pf/pf_if.c b/sys/net/pf/pf_if.c index b623871448..33960e53f5 100644 --- a/sys/net/pf/pf_if.c +++ b/sys/net/pf/pf_if.c @@ -83,7 +83,7 @@ static eventhandler_tag pfi_change_group_cookie; static eventhandler_tag pfi_ifaddr_event_cookie; static void pfi_kif_update(struct pfi_kif *); -static void pfi_dynaddr_update(struct pfi_dynaddr *dyn); +static void pfi_dynaddr_update(struct pfi_dynaddr *); static void pfi_table_update(struct pfr_ktable *, struct pfi_kif *, int, int); static void pfi_instance_add(struct ifnet *, int, int); diff --git a/sys/net/pf/pf_ioctl.c b/sys/net/pf/pf_ioctl.c index 8b407c9776..b245de34e3 100644 --- a/sys/net/pf/pf_ioctl.c +++ b/sys/net/pf/pf_ioctl.c @@ -3106,7 +3106,7 @@ pf_clear_states(void) s->sync_flags = PFSTATE_NOSYNC; pf_unlink_state(s); } - + } lwkt_setcpu_self(save_gd); @@ -3225,8 +3225,9 @@ shutdown_pf(void) /* status does not use malloced mem so no need to cleanup */ /* fingerprints and interfaces have their own cleanup code */ - } while(0); - return (error); + } while (0); + + return (error); } static int diff --git a/sys/net/pf/pfvar.h b/sys/net/pf/pfvar.h index a2e71acb57..72b43440a4 100644 --- a/sys/net/pf/pfvar.h +++ b/sys/net/pf/pfvar.h @@ -65,18 +65,18 @@ struct pf_state; extern struct lwkt_token pf_token; extern struct lwkt_token pf_gtoken; -#define PF_TCPS_PROXY_SRC ((TCP_NSTATES)+0) -#define PF_TCPS_PROXY_DST ((TCP_NSTATES)+1) +#define PF_TCPS_PROXY_SRC ((TCP_NSTATES)+0) +#define PF_TCPS_PROXY_DST ((TCP_NSTATES)+1) -#define RTLABEL_LEN 32 +#define RTLABEL_LEN 32 #define BPF_DIRECTION_OUT (1<<1) -#define PWAIT 0 -#define RT_NUMFIBS 1 -#define ALTQ_IS_ENABLED(ifq) ((ifq)->altq_flags & ALTQF_ENABLED) +#define PWAIT 0 +#define RT_NUMFIBS 1 +#define ALTQ_IS_ENABLED(ifq) ((ifq)->altq_flags & ALTQF_ENABLED) -#define PF_MD5_DIGEST_LENGTH 16 +#define PF_MD5_DIGEST_LENGTH 16 #ifdef MD5_DIGEST_LENGTH #if PF_MD5_DIGEST_LENGTH != MD5_DIGEST_LENGTH #error @@ -142,12 +142,12 @@ enum { PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE, PF_ADDR_DYNIFTL, PF_ADDR_RANGE }; #define PF_POOL_TYPEMASK 0x0f #define PF_POOL_STICKYADDR 0x20 -#define PF_WSCALE_FLAG 0x80 -#define PF_WSCALE_MASK 0x0f +#define PF_WSCALE_FLAG 0x80 +#define PF_WSCALE_MASK 0x0f -#define PF_LOG 0x01 -#define PF_LOG_ALL 0x02 -#define PF_LOG_SOCKET_LOOKUP 0x04 +#define PF_LOG 0x01 +#define PF_LOG_ALL 0x02 +#define PF_LOG_SOCKET_LOOKUP 0x04 #define PR_WAITOK 0x0001 /* M_WAITOK */ #define PR_NOWAIT 0x0002 /* M_NOWAIT */ @@ -170,7 +170,7 @@ struct pf_addr { #define addr32 pfa.addr32 }; -#define PF_TABLE_NAME_SIZE 32 +#define PF_TABLE_NAME_SIZE 32 #define PFI_AFLAG_NETWORK 0x01 #define PFI_AFLAG_BROADCAST 0x02 @@ -222,7 +222,7 @@ struct pfi_dynaddr { */ #define NTOHS(x) (x) = ntohs((__uint16_t)(x)) -#define HTONS(x) (x) = htons((__uint16_t)(x)) +#define HTONS(x) (x) = htons((__uint16_t)(x)) #define PF_NAME "pf" diff --git a/sys/net/route.c b/sys/net/route.c index 971a4ac57b..a2769880f7 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -116,7 +116,7 @@ SYSCTL_NODE(_net, OID_AUTO, route, CTLFLAG_RW, 0, "Routing"); #ifdef ROUTE_DEBUG static int route_debug = 1; SYSCTL_INT(_net_route, OID_AUTO, route_debug, CTLFLAG_RW, - &route_debug, 0, ""); + &route_debug, 0, ""); #endif u_long route_kmalloc_limit = 0; @@ -153,7 +153,7 @@ rtable_init_oncpu(netmsg_t msg) if (dom->dom_rtattach) { dom->dom_rtattach( (void **)&rt_tables[cpu][dom->dom_family], - dom->dom_rtoffset); + dom->dom_rtoffset); } } netisr_forwardmsg(&msg->base, cpu + 1); diff --git a/sys/net/route.h b/sys/net/route.h index be8759c6cf..ade7258ee9 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -60,7 +60,6 @@ * * @(#)route.h 8.4 (Berkeley) 1/9/95 * $FreeBSD: src/sys/net/route.h,v 1.36.2.5 2002/02/01 11:48:01 ru Exp $ - * $DragonFly: src/sys/net/route.h,v 1.24 2008/09/11 11:23:29 sephe Exp $ */ #ifndef _NET_ROUTE_H_ @@ -382,7 +381,7 @@ rtlookup(struct sockaddr *dst) } typedef void (*rtrequest1_callback_func_t)(int, int, struct rt_addrinfo *, - struct rtentry *, void *); + struct rtentry *, void *); typedef int (*rtsearch_callback_func_t)(int, struct rt_addrinfo *, struct rtentry *, void *, int); diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h index 01a766fa3e..2d1a086816 100644 --- a/sys/sys/sockio.h +++ b/sys/sys/sockio.h @@ -92,7 +92,7 @@ #define SIOCGIFSTATUS _IOWR('i', 59, struct ifstat) /* get IF status */ #define SIOCSIFLLADDR _IOW('i', 60, struct ifreq) /* set linklevel addr */ -#define SIOCSIFPHYADDR _IOW('i', 70, struct ifaliasreq) /* set gif addres */ +#define SIOCSIFPHYADDR _IOW('i', 70, struct ifaliasreq) /* set gif addres */ #define SIOCGIFPSRCADDR _IOWR('i', 71, struct ifreq) /* get gif psrc addr */ #define SIOCGIFPDSTADDR _IOWR('i', 72, struct ifreq) /* get gif pdst addr */ #define SIOCDIFPHYADDR _IOW('i', 73, struct ifreq) /* delete gif addrs */ @@ -102,22 +102,22 @@ #define SIOCGPRIVATE_0 _IOWR('i', 80, struct ifreq) /* Linux Private + 0 */ #define SIOCGPRIVATE_1 _IOWR('i', 81, struct ifreq) /* Linux Private + 1 */ -#define SIOCSDRVSPEC _IOW('i', 123, struct ifdrv) /* set driver-specific +#define SIOCSDRVSPEC _IOW('i', 123, struct ifdrv) /* set driver-specific parameters */ -#define SIOCGDRVSPEC _IOWR('i', 123, struct ifdrv) /* get driver-specific +#define SIOCGDRVSPEC _IOWR('i', 123, struct ifdrv) /* get driver-specific parameters */ -#define SIOCIFGCLONERS _IOWR('i', 120, struct if_clonereq) /* get cloners */ -#define SIOCIFDESTROY _IOW('i', 121, struct ifreq) /* destroy clone if */ -#define SIOCIFCREATE _IOWR('i', 122, struct ifreq) /* create clone if */ +#define SIOCIFGCLONERS _IOWR('i', 120, struct if_clonereq) /* get cloners */ +#define SIOCIFDESTROY _IOW('i', 121, struct ifreq) /* destroy clone if */ +#define SIOCIFCREATE _IOWR('i', 122, struct ifreq) /* create clone if */ /* 123 SIOC[SG]DRVSPEC */ -#define SIOCIFCREATE2 _IOWR('i', 124, struct ifreq) /* create clone if */ +#define SIOCIFCREATE2 _IOWR('i', 124, struct ifreq) /* create clone if */ -#define SIOCSIFPOLLCPU _IOW('i', 125, struct ifreq) /* deprecated */ -#define SIOCGIFPOLLCPU _IOWR('i', 126, struct ifreq) /* deprecated */ +#define SIOCSIFPOLLCPU _IOW('i', 125, struct ifreq) /* deprecated */ +#define SIOCGIFPOLLCPU _IOWR('i', 126, struct ifreq) /* deprecated */ -#define SIOCSIFTSOLEN _IOW('i', 127, struct ifreq) /* set max TSO len */ -#define SIOCGIFTSOLEN _IOWR('i', 128, struct ifreq) /* get max TSO len */ +#define SIOCSIFTSOLEN _IOW('i', 127, struct ifreq) /* set max TSO len */ +#define SIOCGIFTSOLEN _IOWR('i', 128, struct ifreq) /* get max TSO len */ #define SIOCAIFGROUP _IOW('i', 135, struct ifgroupreq) /* add an ifgroup */ #define SIOCGIFGROUP _IOWR('i', 136, struct ifgroupreq) /* get ifgroups */