projects
/
unix-history
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. Remove a rather strangely gratuitous bit of profanity
[unix-history]
/
sys
/
net
/
if.c
diff --git
a/sys/net/if.c
b/sys/net/if.c
index
aa82e84
..
590fde2
100644
(file)
--- a/
sys/net/if.c
+++ b/
sys/net/if.c
@@
-31,7
+31,7
@@
* SUCH DAMAGE.
*
* from: @(#)if.c 7.14 (Berkeley) 4/20/91
* SUCH DAMAGE.
*
* from: @(#)if.c 7.14 (Berkeley) 4/20/91
- * $Id: if.c,v 1.
6 1993/11/25 01:33:52
wollman Exp $
+ * $Id: if.c,v 1.
8 1994/05/02 19:10:20
wollman Exp $
*/
#include "param.h"
*/
#include "param.h"
@@
-204,7
+204,7
@@
ifa_ifwithdstaddr(addr)
for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
if (ifa->ifa_addr->sa_family != addr->sa_family)
continue;
for (ifa = ifp->if_addrlist; ifa; ifa = ifa->ifa_next) {
if (ifa->ifa_addr->sa_family != addr->sa_family)
continue;
- if (equal(addr, ifa->ifa_dstaddr))
+ if (
ifa->ifa_dstaddr &&
equal(addr, ifa->ifa_dstaddr))
return (ifa);
}
return ((struct ifaddr *)0);
return (ifa);
}
return ((struct ifaddr *)0);
@@
-506,7
+506,8
@@
ifioctl(so, cmd, data, p)
return (EOPNOTSUPP);
#ifndef COMPAT_43
return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL,
return (EOPNOTSUPP);
#ifndef COMPAT_43
return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL,
- cmd, data, ifp));
+ (struct mbuf *)cmd, (struct mbuf *)data,
+ (struct mbuf *)ifp, (struct mbuf *)0));
#else
{
int ocmd = cmd;
#else
{
int ocmd = cmd;