Author: rpaulo
Date: Wed Oct 13 17:38:23 2010
New Revision: 213795
URL: http://svn.freebsd.org/changeset/base/213795
Log:
Revert r213793.
Modified:
head/sys/dev/ce/if_ce.c
head/sys/dev/cp/if_cp.c
Modified: head/sys/dev/ce/if_ce.c
==============================================================================
--- head/sys/dev/ce/if_ce.c Wed Oct 13 17:21:21 2010 (r213794)
+++ head/sys/dev/ce/if_ce.c Wed Oct 13 17:38:23 2010 (r213795)
@@ -1313,7 +1313,7 @@ static int ce_ioctl (struct cdev *dev, u
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)) {
+ } else if (! strcmp ("fr", (char*)data) && PP_FR) {
d->ifp->if_flags &= ~(PP_CISCO);
IFP2SP(d->ifp)->pp_flags |= PP_FR | PP_KEEPALIVE;
} else if (! strcmp ("ppp", (char*)data)) {
Modified: head/sys/dev/cp/if_cp.c
==============================================================================
--- head/sys/dev/cp/if_cp.c Wed Oct 13 17:21:21 2010 (r213794)
+++ head/sys/dev/cp/if_cp.c Wed Oct 13 17:38:23 2010 (r213795)
@@ -1052,7 +1052,7 @@ static int cp_ioctl (struct cdev *dev, u
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)) {
+ } else if (! strcmp ("fr", (char*)data) && PP_FR) {
d->ifp->if_flags &= ~(PP_CISCO);
IFP2SP(d->ifp)->pp_flags |= PP_FR | PP_KEEPALIVE;
} else if (! strcmp ("ppp", (char*)data)) {
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
