diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2011-12-29 17:46:24 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2011-12-29 17:46:24 +0000 |
| commit | 8520ce600138f17507bc47d9f2994db7e5c23728 (patch) | |
| tree | 112f92df578bc400fa5be279cca2bccf2f7f0b07 /sys/dev/ce | |
| parent | b494482f39cc9f5c4b5323419a8c851747cde440 (diff) | |
| download | src-8520ce600138f17507bc47d9f2994db7e5c23728.tar.gz src-8520ce600138f17507bc47d9f2994db7e5c23728.zip | |
Fix clang warnings in sys/dev/ce/if_ce.c and sys/dev/cp/if_cp.c,
using jkim's last patch (reviewed by bde) from here:
http://docs.freebsd.org/cgi/mid.cgi?201010141558.03154.jkim
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=228963
Diffstat (limited to 'sys/dev/ce')
| -rw-r--r-- | sys/dev/ce/if_ce.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c index d151b4243a8f..7fb208a02d8d 100644 --- a/sys/dev/ce/if_ce.c +++ b/sys/dev/ce/if_ce.c @@ -1313,9 +1313,11 @@ static int ce_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struc IFP2SP(d->ifp)->pp_flags &= ~(PP_FR); IFP2SP(d->ifp)->pp_flags |= PP_KEEPALIVE; d->ifp->if_flags |= PP_CISCO; - } else if (! strcmp ("fr", (char*)data) && PP_FR) { +#if PP_FR != 0 + } else if (! strcmp ("fr", (char*)data)) { d->ifp->if_flags &= ~(PP_CISCO); IFP2SP(d->ifp)->pp_flags |= PP_FR | PP_KEEPALIVE; +#endif } else if (! strcmp ("ppp", (char*)data)) { IFP2SP(d->ifp)->pp_flags &= ~PP_FR; IFP2SP(d->ifp)->pp_flags &= ~PP_KEEPALIVE; |