[Midnightbsd-cvs] src [9928] trunk/sys/netatalk: sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 25 09:13:07 EDT 2018
Revision: 9928
http://svnweb.midnightbsd.org/src/?rev=9928
Author: laffer1
Date: 2018-05-25 09:13:07 -0400 (Fri, 25 May 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/sys/netatalk/aarp.c
trunk/sys/netatalk/aarp.h
trunk/sys/netatalk/at.h
trunk/sys/netatalk/at_control.c
trunk/sys/netatalk/at_extern.h
trunk/sys/netatalk/at_proto.c
trunk/sys/netatalk/at_rmx.c
trunk/sys/netatalk/at_var.h
trunk/sys/netatalk/ddp.h
trunk/sys/netatalk/ddp_input.c
trunk/sys/netatalk/ddp_output.c
trunk/sys/netatalk/ddp_pcb.c
trunk/sys/netatalk/ddp_pcb.h
trunk/sys/netatalk/ddp_usrreq.c
trunk/sys/netatalk/ddp_var.h
trunk/sys/netatalk/endian.h
trunk/sys/netatalk/phase2.h
Modified: trunk/sys/netatalk/aarp.c
===================================================================
--- trunk/sys/netatalk/aarp.c 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/aarp.c 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004-2009 Robert N. M. Watson
* All rights reserved.
@@ -47,7 +48,7 @@
* +1-313-764-2278
* netatalk at umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/aarp.c 249925 2013-04-26 12:50:32Z glebius $
*/
#include "opt_atalk.h"
@@ -147,7 +148,7 @@
* unlocked variant returns a reference that the caller must dispose of.
*/
struct at_ifaddr *
-at_ifawithnet_locked(struct sockaddr_at *sat)
+at_ifawithnet_locked(const struct sockaddr_at *sat)
{
struct at_ifaddr *aa;
struct sockaddr_at *sat2;
@@ -167,7 +168,7 @@
}
struct at_ifaddr *
-at_ifawithnet(struct sockaddr_at *sat)
+at_ifawithnet(const struct sockaddr_at *sat)
{
struct at_ifaddr *aa;
@@ -180,7 +181,7 @@
}
static void
-aarpwhohas(struct ifnet *ifp, struct sockaddr_at *sat)
+aarpwhohas(struct ifnet *ifp, const struct sockaddr_at *sat)
{
struct mbuf *m;
struct ether_header *eh;
@@ -190,7 +191,7 @@
struct sockaddr sa;
AARPTAB_UNLOCK_ASSERT();
- m = m_gethdr(M_DONTWAIT, MT_DATA);
+ m = m_gethdr(M_NOWAIT, MT_DATA);
if (m == NULL)
return;
#ifdef MAC
@@ -230,7 +231,7 @@
sizeof(eh->ether_dhost));
eh->ether_type = htons(sizeof(struct llc) +
sizeof(struct ether_aarp));
- M_PREPEND(m, sizeof(struct llc), M_DONTWAIT);
+ M_PREPEND(m, sizeof(struct llc), M_NOWAIT);
if (m == NULL) {
ifa_free(&aa->aa_ifa);
return;
@@ -267,8 +268,8 @@
}
int
-aarpresolve(struct ifnet *ifp, struct mbuf *m, struct sockaddr_at *destsat,
- u_char *desten)
+aarpresolve(struct ifnet *ifp, struct mbuf *m,
+ const struct sockaddr_at *destsat, u_char *desten)
{
struct at_ifaddr *aa;
struct aarptab *aat;
@@ -467,7 +468,7 @@
if (aat != NULL) {
if (op == AARPOP_PROBE) {
/*
- * Someone's probing for spa, dealocate the one we've
+ * Someone's probing for spa, deallocate the one we've
* got, so that if the prober keeps the address,
* we'll be able to arp for him.
*/
@@ -524,7 +525,7 @@
if (aa->aa_flags & AFA_PHASE2) {
eh->ether_type = htons(sizeof(struct llc) +
sizeof(struct ether_aarp));
- M_PREPEND(m, sizeof(struct llc), M_DONTWAIT);
+ M_PREPEND(m, sizeof(struct llc), M_NOWAIT);
if (m == NULL) {
ifa_free(&aa->aa_ifa);
return;
@@ -567,7 +568,7 @@
}
struct aarptab *
-aarptnew(struct at_addr *addr)
+aarptnew(const struct at_addr *addr)
{
int n;
int oldest = -1;
@@ -643,7 +644,7 @@
ifa_ref(&aa->aa_ifa);
AARPTAB_UNLOCK();
- m = m_gethdr(M_DONTWAIT, MT_DATA);
+ m = m_gethdr(M_NOWAIT, MT_DATA);
if (m == NULL) {
ifa_free(&aa->aa_ifa);
return;
@@ -673,7 +674,7 @@
sizeof(eh->ether_dhost));
eh->ether_type = htons(sizeof(struct llc) +
sizeof(struct ether_aarp));
- M_PREPEND(m, sizeof(struct llc), M_WAIT);
+ M_PREPEND(m, sizeof(struct llc), M_WAITOK);
llc = mtod(m, struct llc *);
llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
llc->llc_control = LLC_UI;
Modified: trunk/sys/netatalk/aarp.h
===================================================================
--- trunk/sys/netatalk/aarp.h 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/aarp.h 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
@@ -23,7 +24,7 @@
* +1-313-764-2278
* netatalk at umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/aarp.h 249925 2013-04-26 12:50:32Z glebius $
*/
#ifndef _NETATALK_AARP_H_
@@ -80,7 +81,7 @@
#define AARPOP_PROBE 0x03
#ifdef _KERNEL
-struct aarptab *aarptnew(struct at_addr *);
+struct aarptab *aarptnew(const struct at_addr *);
#endif
#endif /* _NETATALK_AARP_H_ */
Modified: trunk/sys/netatalk/at.h
===================================================================
--- trunk/sys/netatalk/at.h 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/at.h 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
@@ -20,7 +21,7 @@
* +1-313-763-0525
* netatalk at itd.umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/at.h 165972 2007-01-12 13:18:08Z rwatson $
*/
#ifndef _NETATALK_AT_H_
Modified: trunk/sys/netatalk/at_control.c
===================================================================
--- trunk/sys/netatalk/at_control.c 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/at_control.c 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* Copyright (c) 2009 Robert N. M. Watson
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/netatalk/at_control.c 249925 2013-04-26 12:50:32Z glebius $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -721,7 +722,7 @@
* check whether a given address is a broadcast address for us..
*/
int
-at_broadcast(struct sockaddr_at *sat)
+at_broadcast(const struct sockaddr_at *sat)
{
struct at_ifaddr *aa;
Modified: trunk/sys/netatalk/at_extern.h
===================================================================
--- trunk/sys/netatalk/at_extern.h 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/at_extern.h 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990,1994 Regents of The University of Michigan.
* All Rights Reserved.
@@ -23,7 +24,7 @@
* +1-313-764-2278
* netatalk at umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/at_extern.h 249925 2013-04-26 12:50:32Z glebius $
*/
#ifndef _NETATALK_AT_EXTERN_H_
@@ -46,16 +47,16 @@
void aarpintr(struct mbuf *);
void aarpprobe(void *arg);
int aarpresolve(struct ifnet *, struct mbuf *,
- struct sockaddr_at *, u_char *);
+ const struct sockaddr_at *, u_char *);
void aarp_clean(void);
void at1intr(struct mbuf *);
void at2intr(struct mbuf *);
-int at_broadcast(struct sockaddr_at *);
+int at_broadcast(const struct sockaddr_at *);
u_short at_cksum(struct mbuf *m, int skip);
int at_control(struct socket *so, u_long cmd, caddr_t data,
struct ifnet *ifp, struct thread *td);
-struct at_ifaddr *at_ifawithnet(struct sockaddr_at *);
-struct at_ifaddr *at_ifawithnet_locked(struct sockaddr_at *sat);
+struct at_ifaddr *at_ifawithnet(const struct sockaddr_at *);
+struct at_ifaddr *at_ifawithnet_locked(const struct sockaddr_at *sat);
int at_inithead(void**, int);
void ddp_init(void);
Modified: trunk/sys/netatalk/at_proto.c
===================================================================
--- trunk/sys/netatalk/at_proto.c 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/at_proto.c 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1991 Regents of The University of Michigan.
* All Rights Reserved.
@@ -20,10 +21,11 @@
* +1-313-763-0525
* netatalk at itd.umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/at_proto.c 263478 2014-03-21 15:15:30Z glebius $
*/
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/protosw.h>
#include <sys/domain.h>
#include <sys/socket.h>
Modified: trunk/sys/netatalk/at_rmx.c
===================================================================
--- trunk/sys/netatalk/at_rmx.c 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/at_rmx.c 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright 1994, 1995 Massachusetts Institute of Technology
*
@@ -27,7 +28,7 @@
* SUCH DAMAGE.
*
* at_rmx.c,v 1.13 1995/05/30 08:09:31 rgrimes Exp
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/at_rmx.c 194818 2009-06-24 10:28:30Z rwatson $
*/
/* This code generates debugging traces to the radix code. */
Modified: trunk/sys/netatalk/at_var.h
===================================================================
--- trunk/sys/netatalk/at_var.h 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/at_var.h 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1991 Regents of The University of Michigan.
* All Rights Reserved.
@@ -20,7 +21,7 @@
* +1-313-763-0525
* netatalk at itd.umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/at_var.h 194913 2009-06-24 21:36:09Z rwatson $
*/
#ifndef _NETATALK_AT_VAR_H_
Modified: trunk/sys/netatalk/ddp.h
===================================================================
--- trunk/sys/netatalk/ddp.h 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/ddp.h 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1991 Regents of The University of Michigan.
* All Rights Reserved.
@@ -20,7 +21,7 @@
* +1-313-763-0525
* netatalk at itd.umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/ddp.h 171078 2007-06-28 12:54:58Z rwatson $
*/
#ifndef _NETATALK_DDP_H_
Modified: trunk/sys/netatalk/ddp_input.c
===================================================================
--- trunk/sys/netatalk/ddp_input.c 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/ddp_input.c 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004-2009 Robert N. M. Watson
* All rights reserved.
@@ -46,7 +47,7 @@
* +1-313-764-2278
* netatalk at umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/ddp_input.c 194913 2009-06-24 21:36:09Z rwatson $
*/
#include <sys/param.h>
Modified: trunk/sys/netatalk/ddp_output.c
===================================================================
--- trunk/sys/netatalk/ddp_output.c 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/ddp_output.c 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1991 Regents of The University of Michigan.
* All Rights Reserved.
@@ -21,7 +22,7 @@
* netatalk at itd.umich.edu
*/
-/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/netatalk/ddp_output.c 263478 2014-03-21 15:15:30Z glebius $ */
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +55,7 @@
mac_socket_create_mbuf(so, m);
#endif
- M_PREPEND(m, sizeof(struct ddpehdr), M_DONTWAIT);
+ M_PREPEND(m, sizeof(struct ddpehdr), M_NOWAIT);
if (m == NULL)
return (ENOBUFS);
@@ -201,7 +202,7 @@
* removing mac_mbuf_copy().
*/
if (!(aa->aa_flags & AFA_PHASE2)) {
- MGET(m0, M_DONTWAIT, MT_DATA);
+ MGET(m0, M_NOWAIT, MT_DATA);
if (m0 == NULL) {
ifa_free(&aa->aa_ifa);
m_freem(m);
@@ -221,7 +222,7 @@
elh->el_type = ELAP_DDPEXTEND;
elh->el_dnode = gate.sat_addr.s_node;
}
- ro->ro_rt->rt_use++;
+ counter_u64_add(ro->ro_rt->rt_pksent, 1);
#ifdef NETATALK_DEBUG
printf ("ddp_route: from %d.%d to %d.%d, via %d.%d (%s)\n",
Modified: trunk/sys/netatalk/ddp_pcb.c
===================================================================
--- trunk/sys/netatalk/ddp_pcb.c 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/ddp_pcb.c 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004-2009 Robert N. M. Watson
* All rights reserved.
@@ -46,7 +47,7 @@
* Ann Arbor, Michigan
* +1-313-764-2278
* netatalk at umich.edu
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/ddp_pcb.c 194913 2009-06-24 21:36:09Z rwatson $
*/
#include <sys/param.h>
Modified: trunk/sys/netatalk/ddp_pcb.h
===================================================================
--- trunk/sys/netatalk/ddp_pcb.h 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/ddp_pcb.h 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004 Robert N. M. Watson
* All rights reserved.
@@ -47,7 +48,7 @@
* +1-313-764-2278
* netatalk at umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/ddp_pcb.h 165974 2007-01-12 15:07:51Z rwatson $
*/
#ifndef _NETATALK_DDP_PCB_H_
Modified: trunk/sys/netatalk/ddp_usrreq.c
===================================================================
--- trunk/sys/netatalk/ddp_usrreq.c 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/ddp_usrreq.c 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2004-2009 Robert N. M. Watson
* All rights reserved.
@@ -47,7 +48,7 @@
* +1-313-764-2278
* netatalk at umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/ddp_usrreq.c 194913 2009-06-24 21:36:09Z rwatson $
*/
#include <sys/param.h>
Modified: trunk/sys/netatalk/ddp_var.h
===================================================================
--- trunk/sys/netatalk/ddp_var.h 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/ddp_var.h 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990, 1994 Regents of The University of Michigan.
* All Rights Reserved.
@@ -23,7 +24,7 @@
* +1-313-764-2278
* netatalk at umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/ddp_var.h 165974 2007-01-12 15:07:51Z rwatson $
*/
#ifndef _NETATALK_DDP_VAR_H_
Modified: trunk/sys/netatalk/endian.h
===================================================================
--- trunk/sys/netatalk/endian.h 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/endian.h 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
@@ -20,7 +21,7 @@
* +1-313-763-0525
* netatalk at itd.umich.edu
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/endian.h 139827 2005-01-07 02:35:34Z imp $
*/
#ifndef _ATALK_ENDIAN_H_
Modified: trunk/sys/netatalk/phase2.h
===================================================================
--- trunk/sys/netatalk/phase2.h 2018-05-25 13:10:11 UTC (rev 9927)
+++ trunk/sys/netatalk/phase2.h 2018-05-25 13:13:07 UTC (rev 9928)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 1990,1991 Regents of The University of Michigan.
* All Rights Reserved.
@@ -22,7 +23,7 @@
* Ann Arbor, Michigan
* +1-313-764-2278
* netatalk at umich.edu
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/netatalk/phase2.h 139827 2005-01-07 02:35:34Z imp $
*/
#include <net/if_llc.h>
More information about the Midnightbsd-cvs
mailing list