/*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2011 Apple Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
#include <net/ether_if_module.h>
#include <sys/socketvar.h>
#include <net/if_vlan_var.h>
-#include <net/if_bond_var.h>
+#if BOND
+#include <net/if_bond_internal.h>
+#endif /* BOND */
+#if IF_BRIDGE
+#include <net/if_bridgevar.h>
+#endif /* IF_BRIDGE */
#include <net/dlil.h>
#endif
-#if BRIDGE
-#include <net/bridge.h>
-#endif
-
#define memcpy(x,y,z) bcopy(y, x, z)
#endif
/*
- * Header for the demux list, hangs off of IFP at family_cookie
+ * Header for the demux list, hangs off of IFP at if_family_cookie
*/
struct ether_desc_blk_str {
__private_extern__ u_char etherbroadcastaddr[ETHER_ADDR_LEN] =
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-static __inline__ int
-_ether_cmp(const void * a, const void * b)
-{
- const u_int16_t * a_s = (const u_int16_t *)a;
- const u_int16_t * b_s = (const u_int16_t *)b;
-
- if (a_s[0] != b_s[0]
- || a_s[1] != b_s[1]
- || a_s[2] != b_s[2]) {
- return (1);
- }
- return (0);
-}
/*
* Release all descriptor entries owned by this protocol (there may be several).
ifnet_t ifp,
protocol_family_t protocol_family)
{
- struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->family_cookie;
+ struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->if_family_cookie;
u_int32_t current = 0;
int found = 0;
}
if (desc_blk->n_used == 0) {
- FREE(ifp->family_cookie, M_IFADDR);
- ifp->family_cookie = 0;
+ FREE(ifp->if_family_cookie, M_IFADDR);
+ ifp->if_family_cookie = 0;
}
else {
/* Decrement n_max_used */
const struct ifnet_demux_desc *demux)
{
struct en_desc *ed;
- struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->family_cookie;
+ struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->if_family_cookie;
u_int32_t i;
switch (demux->type) {
FREE(desc_blk, M_IFADDR);
}
desc_blk = tmp;
- ifp->family_cookie = (uintptr_t)desc_blk;
+ ifp->if_family_cookie = (uintptr_t)desc_blk;
desc_blk->n_count = new_count;
}
else {
char *frame_header,
protocol_family_t *protocol_family)
{
- struct ether_header *eh = (struct ether_header *)frame_header;
+ struct ether_header *eh = (struct ether_header *)(void *)frame_header;
u_short ether_type = eh->ether_type;
u_int16_t type;
u_int8_t *data;
u_int32_t i = 0;
- struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->family_cookie;
+ struct ether_desc_blk_str *desc_blk = (struct ether_desc_blk_str *)ifp->if_family_cookie;
u_int32_t maxd = desc_blk ? desc_blk->n_max_used : 0;
struct en_desc *ed = desc_blk ? desc_blk->block_ptr : NULL;
u_int32_t extProto1 = 0;
m->m_flags |= M_MCAST;
}
+ if (m->m_flags & M_HASFCS) {
+ /*
+ * If the M_HASFCS is set by the driver we want to make sure
+ * that we strip off the trailing FCS data before handing it
+ * up the stack.
+ */
+ m_adj(m, -ETHER_CRC_LEN);
+ m->m_flags &= ~M_HASFCS;
+ }
+
if (ifp->if_eflags & IFEF_BOND) {
/* if we're bonded, bond "protocol" gets all the packets */
*protocol_family = PF_BOND;
else if (ether_type == htons(ETHERTYPE_VLAN)) {
struct ether_vlan_header * evl;
- evl = (struct ether_vlan_header *)frame_header;
+ evl = (struct ether_vlan_header *)(void *)frame_header;
if (m->m_len < ETHER_VLAN_ENCAP_LEN
|| ntohs(evl->evl_proto) == ETHERTYPE_VLAN
|| EVL_VLANOFTAG(ntohs(evl->evl_tag)) != 0) {
*/
if (ntohs(ether_type) <= 1500) {
- extProto1 = *(u_int32_t*)data;
+ bcopy(data, &extProto1, sizeof (u_int32_t));
// SAP or SNAP
if ((extProto1 & htonl(0xFFFFFF00)) == htonl(0xAAAA0300)) {
// SNAP
type = DLIL_DESC_SNAP;
- extProto2 = *(u_int32_t*)(data + sizeof(u_int32_t));
+ bcopy(data + sizeof(u_int32_t), &extProto2, sizeof (u_int32_t));
extProto1 &= htonl(0x000000FF);
} else {
type = DLIL_DESC_SAP;
*/
int
ether_frameout(
- struct ifnet *ifp,
- struct mbuf **m,
- const struct sockaddr *ndest,
- const char *edst,
- const char *ether_type)
+ struct ifnet *ifp,
+ struct mbuf **m,
+ const struct sockaddr *ndest,
+ const char *edst,
+ const char *ether_type
+#if KPI_INTERFACE_EMBEDDED
+ ,
+ u_int32_t *prepend_len,
+ u_int32_t *postpend_len
+#endif /* KPI_INTERFACE_EMBEDDED */
+ )
{
struct ether_header *eh;
int hlen; /* link layer header length */
if ((*m)->m_flags & M_BCAST) {
struct mbuf *n = m_copy(*m, 0, (int)M_COPYALL);
if (n != NULL)
- dlil_output(lo_ifp, ndest->sa_family, n, NULL, ndest, 0);
+ dlil_output(lo_ifp, ndest->sa_family, n, NULL, ndest, 0, NULL);
}
else {
if (_ether_cmp(edst, ifnet_lladdr(ifp)) == 0) {
- dlil_output(lo_ifp, ndest->sa_family, *m, NULL, ndest, 0);
+ dlil_output(lo_ifp, ndest->sa_family, *m, NULL, ndest, 0, NULL);
return EJUSTRETURN;
}
}
return (EJUSTRETURN);
}
-
+#if KPI_INTERFACE_EMBEDDED
+ *prepend_len = sizeof (struct ether_header);
+ *postpend_len = 0;
+#endif /* KPI_INTERFACE_EMBEDDED */
+
eh = mtod(*m, struct ether_header *);
(void)memcpy(&eh->ether_type, ether_type,
sizeof(eh->ether_type));
break;
case AF_LINK:
- e_addr = CONST_LLADDR((const struct sockaddr_dl*)proto_addr);
+ e_addr = CONST_LLADDR((const struct sockaddr_dl*)
+ (uintptr_t)(size_t)proto_addr);
if ((e_addr[0] & 0x01) != 0x01)
result = EADDRNOTAVAIL;
else
#if BOND
bond_family_init();
#endif /* BOND */
+#if IF_BRIDGE
+ bridgeattach(0);
+#endif /* IF_BRIDGE */
done:
projects / apple / xnu.git / blobdiff