Module Name: src
Committed By: sborrill
Date: Thu Jan 5 09:47:39 UTC 2012
Modified Files:
src/sys/net [netbsd-5]: if.c
Log Message:
Pull up the following revisions(s) (requested by obache in ticket #1708):
sys/net/if.c: revision 1.246
PR/44030: ifreqn2o gets called with the parameters the wrong way around.
Reverts fix for PR 42585 (ticket #1416) as the root cause of the crash is
addressed by PR 44054 (pullup #1541).
To generate a diff of this commit:
cvs rdiff -u -r1.230.4.5 -r1.230.4.6 src/sys/net/if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.230.4.5 src/sys/net/if.c:1.230.4.6
--- src/sys/net/if.c:1.230.4.5 Mon Aug 8 19:33:34 2011
+++ src/sys/net/if.c Thu Jan 5 09:47:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.230.4.5 2011/08/08 19:33:34 riz Exp $ */
+/* $NetBSD: if.c,v 1.230.4.6 2012/01/05 09:47:38 sborrill Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.230.4.5 2011/08/08 19:33:34 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.230.4.6 2012/01/05 09:47:38 sborrill Exp $");
#include "opt_inet.h"
@@ -1715,7 +1715,7 @@ ifioctl(struct socket *so, u_long cmd, v
}
#ifdef COMPAT_OIFREQ
if (cmd != ocmd)
- ifreqn2o(ifr, oifr);
+ ifreqn2o(oifr, ifr);
#endif
return error;
