Deleted Added
full compact
34c34
< * $FreeBSD: head/sys/dev/firewire/if_fwe.c 124251 2004-01-08 14:58:09Z simokawa $
---
> * $FreeBSD: head/sys/dev/firewire/if_fwe.c 127468 2004-03-26 23:17:10Z simokawa $
54a55,60
> #ifdef __DragonFly__
> #include <net/vlan/if_vlan_var.h>
> #include <bus/firewire/firewire.h>
> #include <bus/firewire/firewirereg.h>
> #include "if_fwevar.h"
> #else
59a66
> #endif
198c205
< #if __FreeBSD_version >= 501113
---
> #if __FreeBSD_version >= 501113 || defined(__DragonFly__)
213,215c220
< #if __FreeBSD_version >= 500000
< ether_ifattach(ifp, eaddr);
< #else
---
> #if defined(__DragonFly__) || __FreeBSD_version < 500000
216a222,223
> #else
> ether_ifattach(ifp, eaddr);
222c229
< #if __FreeBSD_version >= 500000
---
> #if defined(__FreeBSD__) && __FreeBSD_version >= 500000
282,284c289
< #if __FreeBSD_version >= 500000
< ether_ifdetach(&fwe->fwe_if);
< #else
---
> #if defined(__DragonFly__) || __FreeBSD_version < 500000
285a291,292
> #else
> ether_ifdetach(&fwe->fwe_if);
348,350c355
< #if __FreeBSD_version >= 500000
< m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
< #else
---
> #if defined(__DragonFly__) || __FreeBSD_version < 500000
351a357,358
> #else
> m_getcl(M_TRYWAIT, MT_DATA, M_PKTHDR);
428c435
< #if __FreeBSD_version >= 500000
---
> #if defined(__FreeBSD__) && __FreeBSD_version >= 500000
439c446
< #if __FreeBSD_version < 500000
---
> #if defined(__DragonFly__) || __FreeBSD_version < 500000
535,537c542
< #if __FreeBSD_version >= 500000
< BPF_MTAP(ifp, m);
< #else
---
> #if defined(__DragonFly__) || __FreeBSD_version < 500000
539a545,546
> #else
> BPF_MTAP(ifp, m);
578c585
< #if __FreeBSD_version < 500000
---
> #if defined(__DragonFly__) || __FreeBSD_version < 500000
611c618
< #if __FreeBSD_version < 500000
---
> #if defined(__DragonFly__) || __FreeBSD_version < 500000
633,635c640
< #if __FreeBSD_version >= 500000
< (*ifp->if_input)(ifp, m);
< #else
---
> #if defined(__DragonFly__) || __FreeBSD_version < 500000
636a642,643
> #else
> (*ifp->if_input)(ifp, m);
662a670,672
> #ifdef __DragonFly__
> DECLARE_DUMMY_MODULE(fwe);
> #endif