Merge ipx_input.c:1.53, spx_usrreq.c:1.66 from HEAD to RELENG_6:
Admit to ourselves that we don't actually implement pr_ctlinput() for IPX or SPX, as the code in the implementing functions is essentially a no-op. Replace with a comment indicating we don't implement these currently.
This commit is contained in:
parent
322724cc00
commit
828233b8f9
@ -294,28 +294,8 @@ ipx_ctlinput(cmd, arg_as_sa, dummy)
|
||||
struct sockaddr *arg_as_sa; /* XXX should be swapped with dummy */
|
||||
void *dummy;
|
||||
{
|
||||
caddr_t arg = (/* XXX */ caddr_t)arg_as_sa;
|
||||
struct ipx_addr *ipx;
|
||||
|
||||
if (cmd < 0 || cmd >= PRC_NCMDS)
|
||||
return;
|
||||
switch (cmd) {
|
||||
struct sockaddr_ipx *sipx;
|
||||
|
||||
case PRC_IFDOWN:
|
||||
case PRC_HOSTDEAD:
|
||||
case PRC_HOSTUNREACH:
|
||||
sipx = (struct sockaddr_ipx *)arg;
|
||||
if (sipx->sipx_family != AF_IPX)
|
||||
return;
|
||||
ipx = &sipx->sipx_addr;
|
||||
break;
|
||||
|
||||
default:
|
||||
if (ipxprintfs)
|
||||
printf("ipx_ctlinput: cmd %d.\n", cmd);
|
||||
break;
|
||||
}
|
||||
/* Currently, nothing. */
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -698,30 +698,8 @@ spx_ctlinput(cmd, arg_as_sa, dummy)
|
||||
struct sockaddr *arg_as_sa; /* XXX should be swapped with dummy */
|
||||
void *dummy;
|
||||
{
|
||||
caddr_t arg = (/* XXX */ caddr_t)arg_as_sa;
|
||||
struct ipx_addr *na;
|
||||
struct sockaddr_ipx *sipx;
|
||||
|
||||
if (cmd < 0 || cmd >= PRC_NCMDS)
|
||||
return;
|
||||
|
||||
switch (cmd) {
|
||||
|
||||
case PRC_ROUTEDEAD:
|
||||
return;
|
||||
|
||||
case PRC_IFDOWN:
|
||||
case PRC_HOSTDEAD:
|
||||
case PRC_HOSTUNREACH:
|
||||
sipx = (struct sockaddr_ipx *)arg;
|
||||
if (sipx->sipx_family != AF_IPX)
|
||||
return;
|
||||
na = &sipx->sipx_addr;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
/* Currently, nothing. */
|
||||
}
|
||||
|
||||
static int
|
||||
|
Loading…
Reference in New Issue
Block a user