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

- Use 'error' variable to store error value, instead of 'i'.

Browse Source 
- Push 'i' into the only block where it is used.
- Remove redundant check for rt being NULL. If rt_check() hasn't
  returned an error, then rt is valid.

Reviewed by:	gnn
This commit is contained in:
Gleb Smirnoff 2005-08-09 08:37:28 +00:00
parent 3ad7e67045
commit 401df2f296
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=148882
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/netinet6/nd6.c
View File

@ -2028,11 +2028,13 @@ nd6_storelladdr(ifp, rt0, m, dst, desten)
struct sockaddr *dst;
u_char *desten;
{
int i;
struct sockaddr_dl *sdl;
struct rtentry *rt;
int error;
if (m->m_flags & M_MCAST) {
int i;
switch (ifp->if_type) {
case IFT_ETHER:
case IFT_FDDI:
@ -2063,17 +2065,12 @@ nd6_storelladdr(ifp, rt0, m, dst, desten)
}
}
i = rt_check(&rt, &rt0, dst);
if (i) {
error = rt_check(&rt, &rt0, dst);
if (error) {
m_freem(m);
return i;
return (error);
}
if (rt == NULL) {
/* this could happen, if we could not allocate memory */
m_freem(m);
return (ENOMEM);
}
if (rt->rt_gateway->sa_family != AF_LINK) {
printf("nd6_storelladdr: something odd happens\n");
m_freem(m);