diff options
author | alfred <alfred@FreeBSD.org> | 2002-03-19 21:54:18 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2002-03-19 21:54:18 +0000 |
commit | c9985516e46bc6cccc11eac067da81d7968b7700 (patch) | |
tree | 1dac628690deaa2d6ec636edfafaaa40b6cc7fd5 /sys/net/if_var.h | |
parent | d0017d9252543e0da162688302446230e54dd45e (diff) | |
download | FreeBSD-src-c9985516e46bc6cccc11eac067da81d7968b7700.zip FreeBSD-src-c9985516e46bc6cccc11eac067da81d7968b7700.tar.gz |
Remove __P.
Diffstat (limited to 'sys/net/if_var.h')
-rw-r--r-- | sys/net/if_var.h | 134 |
1 files changed, 65 insertions, 69 deletions
diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 12cd740..90bcc03 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -148,35 +148,35 @@ struct ifnet { int if_amcount; /* number of all-multicast requests */ /* procedure handles */ int (*if_output) /* output routine (enqueue) */ - __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); + (struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); void (*if_start) /* initiate output routine */ - __P((struct ifnet *)); + (struct ifnet *); int (*if_done) /* output complete routine */ - __P((struct ifnet *)); /* (XXX not used; fake prototype) */ + (struct ifnet *); /* (XXX not used; fake prototype) */ int (*if_ioctl) /* ioctl routine */ - __P((struct ifnet *, u_long, caddr_t)); + (struct ifnet *, u_long, caddr_t); void (*if_watchdog) /* timer routine */ - __P((struct ifnet *)); + (struct ifnet *); int (*if_poll_recv) /* polled receive routine */ - __P((struct ifnet *, int *)); + (struct ifnet *, int *); int (*if_poll_xmit) /* polled transmit routine */ - __P((struct ifnet *, int *)); + (struct ifnet *, int *); void (*if_poll_intren) /* polled interrupt reenable routine */ - __P((struct ifnet *)); + (struct ifnet *); void (*if_poll_slowinput) /* input routine for slow devices */ - __P((struct ifnet *, struct mbuf *)); + (struct ifnet *, struct mbuf *); void (*if_init) /* Init routine */ - __P((void *)); + (void *); int (*if_resolvemulti) /* validate/resolve multicast */ - __P((struct ifnet *, struct sockaddr **, struct sockaddr *)); + (struct ifnet *, struct sockaddr **, struct sockaddr *); struct ifqueue if_snd; /* output queue */ struct ifqueue *if_poll_slowq; /* input queue for slow devices */ struct ifprefixhead if_prefixhead; /* list of prefixes per if */ u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */ }; -typedef void if_init_f_t __P((void *)); +typedef void if_init_f_t(void *); #define if_mtu if_data.ifi_mtu #define if_type if_data.ifi_type @@ -335,7 +335,7 @@ struct ifaddr { struct ifnet *ifa_ifp; /* back-pointer to interface */ TAILQ_ENTRY(ifaddr) ifa_link; /* queue macro glue */ void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */ - __P((int, struct rtentry *, struct rt_addrinfo *)); + (int, struct rtentry *, struct rt_addrinfo *); u_short ifa_flags; /* mostly rt_flags for cloning */ u_int ifa_refcnt; /* references to this structure */ int ifa_metric; /* cost of going out this interface */ @@ -343,7 +343,7 @@ struct ifaddr { struct rtentry *ifa_rt; /* XXXX for ROUTETOIF ????? */ #endif int (*ifa_claim_addr) /* check if an addr goes to this if */ - __P((struct ifaddr *, struct sockaddr *)); + (struct ifaddr *, struct sockaddr *); }; #define IFA_ROUTE RTF_UP /* route installed */ @@ -405,56 +405,53 @@ extern int ifqmaxlen; extern struct ifnet *loif; /* first loopback interface */ extern int if_index; -void ether_ifattach __P((struct ifnet *, int)); -void ether_ifdetach __P((struct ifnet *, int)); -void ether_input __P((struct ifnet *, struct ether_header *, struct mbuf *)); -void ether_demux __P((struct ifnet *, struct ether_header *, struct mbuf *)); -int ether_output __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); -int ether_output_frame __P((struct ifnet *, struct mbuf *)); -int ether_ioctl __P((struct ifnet *, int, caddr_t)); - -int if_addmulti __P((struct ifnet *, struct sockaddr *, - struct ifmultiaddr **)); -int if_allmulti __P((struct ifnet *, int)); -void if_attach __P((struct ifnet *)); -int if_delmulti __P((struct ifnet *, struct sockaddr *)); -void if_detach __P((struct ifnet *)); -void if_down __P((struct ifnet *)); -void if_route __P((struct ifnet *, int flag, int fam)); -int if_setlladdr __P((struct ifnet *, const u_char *, int)); -void if_unroute __P((struct ifnet *, int flag, int fam)); -void if_up __P((struct ifnet *)); -/*void ifinit __P((void));*/ /* declared in systm.h for main() */ -int ifioctl __P((struct socket *, u_long, caddr_t, struct thread *)); -int ifpromisc __P((struct ifnet *, int)); -struct ifnet *ifunit __P((const char *)); -struct ifnet *if_withname __P((struct sockaddr *)); - -int if_poll_recv_slow __P((struct ifnet *ifp, int *quotap)); -void if_poll_xmit_slow __P((struct ifnet *ifp, int *quotap)); -void if_poll_throttle __P((void)); -void if_poll_unthrottle __P((void *)); -void if_poll_init __P((void)); -void if_poll __P((void)); - -struct ifaddr *ifa_ifwithaddr __P((struct sockaddr *)); -struct ifaddr *ifa_ifwithdstaddr __P((struct sockaddr *)); -struct ifaddr *ifa_ifwithnet __P((struct sockaddr *)); -struct ifaddr *ifa_ifwithroute __P((int, struct sockaddr *, - struct sockaddr *)); -struct ifaddr *ifaof_ifpforaddr __P((struct sockaddr *, struct ifnet *)); -void ifafree __P((struct ifaddr *)); - -struct ifmultiaddr *ifmaof_ifpforaddr __P((struct sockaddr *, - struct ifnet *)); -int if_simloop __P((struct ifnet *ifp, struct mbuf *m, int af, int hlen)); - -void if_clone_attach __P((struct if_clone *)); -void if_clone_detach __P((struct if_clone *)); - -int if_clone_create __P((char *, int)); -int if_clone_destroy __P((const char *)); +void ether_ifattach(struct ifnet *, int); +void ether_ifdetach(struct ifnet *, int); +void ether_input(struct ifnet *, struct ether_header *, struct mbuf *); +void ether_demux(struct ifnet *, struct ether_header *, struct mbuf *); +int ether_output(struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); +int ether_output_frame(struct ifnet *, struct mbuf *); +int ether_ioctl(struct ifnet *, int, caddr_t); + +int if_addmulti(struct ifnet *, struct sockaddr *, struct ifmultiaddr **); +int if_allmulti(struct ifnet *, int); +void if_attach(struct ifnet *); +int if_delmulti(struct ifnet *, struct sockaddr *); +void if_detach(struct ifnet *); +void if_down(struct ifnet *); +void if_route(struct ifnet *, int flag, int fam); +int if_setlladdr(struct ifnet *, const u_char *, int); +void if_unroute(struct ifnet *, int flag, int fam); +void if_up(struct ifnet *); +/*void ifinit(void);*/ /* declared in systm.h for main() */ +int ifioctl(struct socket *, u_long, caddr_t, struct thread *); +int ifpromisc(struct ifnet *, int); +struct ifnet *ifunit(const char *); +struct ifnet *if_withname(struct sockaddr *); + +int if_poll_recv_slow(struct ifnet *ifp, int *quotap); +void if_poll_xmit_slow(struct ifnet *ifp, int *quotap); +void if_poll_throttle(void); +void if_poll_unthrottle(void *); +void if_poll_init(void); +void if_poll(void); + +struct ifaddr *ifa_ifwithaddr(struct sockaddr *); +struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *); +struct ifaddr *ifa_ifwithnet(struct sockaddr *); +struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *); +struct ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *); +void ifafree(struct ifaddr *); + +struct ifmultiaddr *ifmaof_ifpforaddr(struct sockaddr *, struct ifnet *); +int if_simloop(struct ifnet *ifp, struct mbuf *m, int af, int hlen); + +void if_clone_attach(struct if_clone *); +void if_clone_detach(struct if_clone *); + +int if_clone_create(char *, int); +int if_clone_destroy(const char *); #define IF_LLADDR(ifp) \ LLADDR((struct sockaddr_dl *) ifaddr_byindex((ifp)->if_index)->ifa_addr) @@ -462,10 +459,9 @@ int if_clone_destroy __P((const char *)); #ifdef DEVICE_POLLING enum poll_cmd { POLL_ONLY, POLL_AND_CHECK_STATUS, POLL_DEREGISTER }; -typedef void poll_handler_t __P((struct ifnet *ifp, - enum poll_cmd cmd, int count)); -int ether_poll_register __P((poll_handler_t *h, struct ifnet *ifp)); -int ether_poll_deregister __P((struct ifnet *ifp)); +typedef void poll_handler_t(struct ifnet *ifp, enum poll_cmd cmd, int count); +int ether_poll_register(poll_handler_t *h, struct ifnet *ifp); +int ether_poll_deregister(struct ifnet *ifp); #endif /* DEVICE_POLLING */ #endif /* _KERNEL */ |