Attachment 11969 Details for Bug 23362 – if_sr.c.diff

[patch] if_sr.c.diff

if_sr.c.diff (text/plain; charset=us-ascii), 983 bytes, created by Bill Fenner on 2001-11-03 00:57:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Fenner

Created: 2001-11-03 00:57:21 UTC

Size: 983 bytes

patch

obsolete

>Index: if_sr.c
>===================================================================
>RCS file: /home/ncvs/src/sys/dev/sr/if_sr.c,v
>retrieving revision 1.47
>diff -u -r1.47 if_sr.c
>--- if_sr.c	26 Feb 2001 16:30:02 -0000	1.47
>+++ if_sr.c	3 Nov 2001 00:52:50 -0000
>@@ -1003,6 +1003,8 @@
> srioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
> {
> 	int s, error, was_up, should_be_up;
>+	int was_cisco, should_be_cisco;
>+#define	IFF_CISCO	IFF_LINK2	/* XXX must match if_spppsubr.c */
> 	struct sr_softc *sc = ifp->if_softc;
> 
> #if BUGGY > 0
>@@ -1011,6 +1013,7 @@
> #endif
> 
> 	was_up = ifp->if_flags & IFF_RUNNING;
>+	was_cisco = ifp->if_flags & IFF_CISCO;
> 
> 	error = sppp_ioctl(ifp, cmd, data);
> 
>@@ -1071,6 +1074,13 @@
> 		sppp_flush(ifp);
> 	}
> 	splx(s);
>+	should_be_cisco = ifp->if_flags & IFF_CISCO;
>+	if (was_cisco != should_be_cisco) {
>+		s = splnet();
>+		bpfdetach(ifp);
>+		bpfattach(ifp, should_be_cisco ? DLT_CHDLC : DLT_PPP,
>+			PPP_HEADER_LEN);
>+	}
> 	return 0;
> }
> #endif /* NETGRAPH */

Actions: View | Diff

Attachments on bug 23362: 11968 | 11969