aarp.c (165971) | aarp.c (173018) |
---|---|
1/*- 2 * Copyright (c) 2004-2005 Robert N. M. Watson 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 33 unchanged lines hidden (view full) --- 42 * Research Systems Unix Group 43 * The University of Michigan 44 * c/o Wesley Craig 45 * 535 W. William Street 46 * Ann Arbor, Michigan 47 * +1-313-764-2278 48 * netatalk@umich.edu 49 * | 1/*- 2 * Copyright (c) 2004-2005 Robert N. M. Watson 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 33 unchanged lines hidden (view full) --- 42 * Research Systems Unix Group 43 * The University of Michigan 44 * c/o Wesley Craig 45 * 535 W. William Street 46 * Ann Arbor, Michigan 47 * +1-313-764-2278 48 * netatalk@umich.edu 49 * |
50 * $FreeBSD: head/sys/netatalk/aarp.c 165971 2007-01-12 12:25:12Z rwatson $ | 50 * $FreeBSD: head/sys/netatalk/aarp.c 173018 2007-10-26 13:18:38Z rwatson $ |
51 */ 52 53#include "opt_atalk.h" 54#include "opt_mac.h" 55 56#include <sys/param.h> 57#include <sys/systm.h> 58#include <sys/mbuf.h> --- 113 unchanged lines hidden (view full) --- 172 struct llc *llc; 173 struct sockaddr sa; 174 175 AARPTAB_UNLOCK_ASSERT(); 176 m = m_gethdr(M_DONTWAIT, MT_DATA); 177 if (m == NULL) 178 return; 179#ifdef MAC | 51 */ 52 53#include "opt_atalk.h" 54#include "opt_mac.h" 55 56#include <sys/param.h> 57#include <sys/systm.h> 58#include <sys/mbuf.h> --- 113 unchanged lines hidden (view full) --- 172 struct llc *llc; 173 struct sockaddr sa; 174 175 AARPTAB_UNLOCK_ASSERT(); 176 m = m_gethdr(M_DONTWAIT, MT_DATA); 177 if (m == NULL) 178 return; 179#ifdef MAC |
180 mac_create_mbuf_linklayer(ifp, m); | 180 mac_mbuf_create_linklayer(ifp, m); |
181#endif 182 m->m_len = sizeof(*ea); 183 m->m_pkthdr.len = sizeof(*ea); 184 MH_ALIGN(m, sizeof(*ea)); 185 186 ea = mtod(m, struct ether_aarp *); 187 bzero((caddr_t)ea, sizeof(*ea)); 188 --- 408 unchanged lines hidden (view full) --- 597 } else 598 callout_reset(&aa->aa_callout, hz / 5, aarpprobe, ifp); 599 AARPTAB_UNLOCK(); 600 601 m = m_gethdr(M_DONTWAIT, MT_DATA); 602 if (m == NULL) 603 return; 604#ifdef MAC | 181#endif 182 m->m_len = sizeof(*ea); 183 m->m_pkthdr.len = sizeof(*ea); 184 MH_ALIGN(m, sizeof(*ea)); 185 186 ea = mtod(m, struct ether_aarp *); 187 bzero((caddr_t)ea, sizeof(*ea)); 188 --- 408 unchanged lines hidden (view full) --- 597 } else 598 callout_reset(&aa->aa_callout, hz / 5, aarpprobe, ifp); 599 AARPTAB_UNLOCK(); 600 601 m = m_gethdr(M_DONTWAIT, MT_DATA); 602 if (m == NULL) 603 return; 604#ifdef MAC |
605 mac_create_mbuf_linklayer(ifp, m); | 605 mac_mbuf_create_linklayer(ifp, m); |
606#endif 607 m->m_len = sizeof(*ea); 608 m->m_pkthdr.len = sizeof(*ea); 609 MH_ALIGN(m, sizeof(*ea)); 610 611 ea = mtod(m, struct ether_aarp *); 612 bzero((caddr_t)ea, sizeof(*ea)); 613 --- 65 unchanged lines hidden --- | 606#endif 607 m->m_len = sizeof(*ea); 608 m->m_pkthdr.len = sizeof(*ea); 609 MH_ALIGN(m, sizeof(*ea)); 610 611 ea = mtod(m, struct ether_aarp *); 612 bzero((caddr_t)ea, sizeof(*ea)); 613 --- 65 unchanged lines hidden --- |