d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from p4 (noticed these changes with DES' if_ethersubr.c changes caused

Browse Source 
a minor conflict):
o Use ETHER_ADDR_LEN in preference to '6'.
o Remove two unnecessary (caddr_t) casts.  One of them causes problems in
  my tree where etherbroadcastaddr is const, and (caddr_t) casts the const
  away.
This commit is contained in:
Warner Losh 2003-10-23 15:09:34 +00:00
parent 1bc8ec4783
commit 64760eb06e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/net/if_ethersubr.c
View File

@ -138,7 +138,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m,
{
short type;
int error = 0, hdrcmplt = 0;
u_char esrc[6], edst[6];
u_char esrc[ETHER_ADDR_LEN], edst[ETHER_ADDR_LEN];
struct rtentry *rt;
struct ether_header *eh;
int loop_copy = 0;
@ -651,8 +651,8 @@ ether_demux(struct ifnet *ifp, struct mbuf *m)
return;
}
if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
if (bcmp((caddr_t)etherbroadcastaddr, (caddr_t)eh->ether_dhost,
sizeof(etherbroadcastaddr)) == 0)
if (bcmp(etherbroadcastaddr, eh->ether_dhost,
sizeof(etherbroadcastaddr)) == 0)
m->m_flags |= M_BCAST;
else
m->m_flags |= M_MCAST;