summaryrefslogtreecommitdiffstats
path: root/sys/netinet/if_fddi.h
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>1997-01-17 23:54:45 +0000
committerjoerg <joerg@FreeBSD.org>1997-01-17 23:54:45 +0000
commit14cfba618c3dd1fe8025d11f956ade25ad77120f (patch)
treea4f5eddb9b3bd12e23dcdc7e486d3c75a0f4e6f5 /sys/netinet/if_fddi.h
parent912bcfa966638919ab4759ca32c659243a368883 (diff)
downloadFreeBSD-src-14cfba618c3dd1fe8025d11f956ade25ad77120f.zip
FreeBSD-src-14cfba618c3dd1fe8025d11f956ade25ad77120f.tar.gz
This mega-merge brings Matt Thomas' 960801 FDDI driver (almost) up
to -current. Thanks goes to Ulrike Nitzsche <ulrike@ifw-dresden.de> for giving me a chance to test this. Only the PCI driver is tested though. One final patch will follow in a separate commit. This is so that everything up to here can be dragged into 2.2, if we decide so. Reviewed by: joerg Submitted by: Matt Thomas <matt@3am-software.com>
Diffstat (limited to 'sys/netinet/if_fddi.h')
-rw-r--r--sys/netinet/if_fddi.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/netinet/if_fddi.h b/sys/netinet/if_fddi.h
index 838c84d..fc6acc6 100644
--- a/sys/netinet/if_fddi.h
+++ b/sys/netinet/if_fddi.h
@@ -1,6 +1,8 @@
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
+ * Copyright (c) 1995 Matt Thomas (thomas@lkg.dec.com)
+ * All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -46,6 +48,7 @@ struct fddi_header {
u_char fddi_shost[6];
};
+#define FDDIIPMTU 4352
#define FDDIMTU 4470
#define FDDIMIN 3
@@ -66,17 +69,18 @@ struct fddi_header {
#define FDDIFC_LLC_SYNC 0xd0
#define FDDIFC_SMT 0x40
-#ifdef KERNEL
+#if defined(KERNEL) || defined(_KERNEL)
#define fddibroadcastaddr etherbroadcastaddr
#define fddi_ipmulticast_min ether_ipmulticast_min
#define fddi_ipmulticast_max ether_ipmulticast_max
#define fddi_addmulti ether_addmulti
#define fddi_delmulti ether_delmulti
+#define fddi_sprintf ether_sprintf
void fddi_ifattach __P((struct ifnet *));
void fddi_input __P((struct ifnet *, struct fddi_header *, struct mbuf *));
int fddi_output __P((struct ifnet *,
- struct mbuf *, struct sockaddr *, struct rtentry *));
+ struct mbuf *, struct sockaddr *, struct rtentry *));
#endif
OpenPOWER on IntegriCloud