Deleted Added
full compact
if_fwe.c (129552) if_fwe.c (129585)
1/*
2 * Copyright (c) 2002-2003
3 * Hidetoshi Shimokawa. 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

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

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
1/*
2 * Copyright (c) 2002-2003
3 * Hidetoshi Shimokawa. 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

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

26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $FreeBSD: head/sys/dev/firewire/if_fwe.c 129552 2004-05-21 17:11:34Z yar $
34 * $FreeBSD: head/sys/dev/firewire/if_fwe.c 129585 2004-05-22 16:14:17Z dfr $
35 */
36
37#include "opt_inet.h"
38
39#include <sys/param.h>
40#include <sys/kernel.h>
41#include <sys/malloc.h>
42#include <sys/mbuf.h>

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

545 bpf_mtap(ifp, m);
546#else
547 BPF_MTAP(ifp, m);
548#endif
549
550 /* keep ip packet alignment for alpha */
551 M_PREPEND(m, ETHER_ALIGN, M_DONTWAIT);
552 fp = &xfer->send.hdr;
35 */
36
37#include "opt_inet.h"
38
39#include <sys/param.h>
40#include <sys/kernel.h>
41#include <sys/malloc.h>
42#include <sys/mbuf.h>

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

545 bpf_mtap(ifp, m);
546#else
547 BPF_MTAP(ifp, m);
548#endif
549
550 /* keep ip packet alignment for alpha */
551 M_PREPEND(m, ETHER_ALIGN, M_DONTWAIT);
552 fp = &xfer->send.hdr;
553 *(u_int32_t *)&xfer->send.hdr = *(int32_t *)&fwe->pkt_hdr;
553 *(uint32_t *)&xfer->send.hdr = *(int32_t *)&fwe->pkt_hdr;
554 fp->mode.stream.len = m->m_pkthdr.len;
555 xfer->mbuf = m;
556 xfer->send.pay_len = m->m_pkthdr.len;
557
558 if (fw_asyreq(fwe->fd.fc, -1, xfer) != 0) {
559 /* error */
560 ifp->if_oerrors ++;
561 /* XXX set error code */

--- 115 unchanged lines hidden ---
554 fp->mode.stream.len = m->m_pkthdr.len;
555 xfer->mbuf = m;
556 xfer->send.pay_len = m->m_pkthdr.len;
557
558 if (fw_asyreq(fwe->fd.fc, -1, xfer) != 0) {
559 /* error */
560 ifp->if_oerrors ++;
561 /* XXX set error code */

--- 115 unchanged lines hidden ---