Deleted Added
full compact
aarp.c (173783) aarp.c (177599)
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 173783 2007-11-20 18:35:57Z rwatson $
50 * $FreeBSD: head/sys/netatalk/aarp.c 177599 2008-03-25 09:39:02Z ru $
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>

--- 569 unchanged lines hidden (view full) ---

628
629 eh = (struct ether_header *)sa.sa_data;
630
631 if (aa->aa_flags & AFA_PHASE2) {
632 bcopy(atmulticastaddr, eh->ether_dhost,
633 sizeof(eh->ether_dhost));
634 eh->ether_type = htons(sizeof(struct llc) +
635 sizeof(struct ether_aarp));
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>

--- 569 unchanged lines hidden (view full) ---

628
629 eh = (struct ether_header *)sa.sa_data;
630
631 if (aa->aa_flags & AFA_PHASE2) {
632 bcopy(atmulticastaddr, eh->ether_dhost,
633 sizeof(eh->ether_dhost));
634 eh->ether_type = htons(sizeof(struct llc) +
635 sizeof(struct ether_aarp));
636 M_PREPEND(m, sizeof(struct llc), M_TRYWAIT);
637 if (m == NULL)
638 return;
636 M_PREPEND(m, sizeof(struct llc), M_WAIT);
639 llc = mtod(m, struct llc *);
640 llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
641 llc->llc_control = LLC_UI;
642 bcopy(aarp_org_code, llc->llc_org_code,
643 sizeof(aarp_org_code));
644 llc->llc_ether_type = htons(ETHERTYPE_AARP);
645
646 bcopy(&AA_SAT(aa)->sat_addr.s_net, ea->aarp_spnet,

--- 39 unchanged lines hidden ---
637 llc = mtod(m, struct llc *);
638 llc->llc_dsap = llc->llc_ssap = LLC_SNAP_LSAP;
639 llc->llc_control = LLC_UI;
640 bcopy(aarp_org_code, llc->llc_org_code,
641 sizeof(aarp_org_code));
642 llc->llc_ether_type = htons(ETHERTYPE_AARP);
643
644 bcopy(&AA_SAT(aa)->sat_addr.s_net, ea->aarp_spnet,

--- 39 unchanged lines hidden ---