jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix warnings in the gif(4) driver so it compiles with -Werror.

Browse Source
This commit is contained in:
Brooks Davis 2002-02-26 20:11:33 +00:00
parent 240b1323c3
commit 6f4ded3a73
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=91327
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/net/if_gif.c
View File

@ -107,14 +107,14 @@ static int gif_encapcheck __P((const struct mbuf *, int, int, void *));
extern struct domain inetdomain;
struct protosw in_gif_protosw =
{ SOCK_RAW, &inetdomain, 0/*IPPROTO_IPV[46]*/, PR_ATOMIC|PR_ADDR,
in_gif_input, rip_output, 0, rip_ctloutput,
in_gif_input, (pr_output_t*)rip_output, 0, rip_ctloutput,
0,
0, 0, 0, 0,
&rip_usrreqs
};
#endif
#ifdef INET6
extern struct domain6 inet6domain;
extern struct domain inet6domain;
struct ip6protosw in6_gif_protosw =
{ SOCK_RAW, &inet6domain, 0/*IPPROTO_IPV[46]*/, PR_ATOMIC|PR_ADDR,
in6_gif_input, rip6_output, 0, rip6_ctloutput,
@ -348,8 +348,7 @@ gif_encapcheck(m, off, proto, arg)
return 0;
}
/* LINTED const cast */
m_copydata((struct mbuf *)m, 0, sizeof(ip), (caddr_t)&ip);
m_copydata(m, 0, sizeof(ip), (caddr_t)&ip);
switch (ip.ip_v) {
#ifdef INET
@ -608,6 +607,9 @@ gif_ioctl(ifp, cmd, data)
&(((struct if_laddrreq *)data)->addr);
dst = (struct sockaddr *)
&(((struct if_laddrreq *)data)->dstaddr);
default:
error = EADDRNOTAVAIL;
goto bad;
}
/* sa_family must be equal */

3
sys/netinet6/in6_gif.c
View File

@ -301,8 +301,7 @@ gif_encapcheck6(m, off, proto, arg)
src = (struct sockaddr_in6 *)sc->gif_psrc;
dst = (struct sockaddr_in6 *)sc->gif_pdst;
/* LINTED const cast */
m_copydata((struct mbuf *)m, 0, sizeof(ip6), (caddr_t)&ip6);
m_copydata(m, 0, sizeof(ip6), (caddr_t)&ip6);
/* check for address match */
addrmatch = 0;