CARP panic

[Sepherosa Ziehau]

On Thu, Jul 24, 2008 at 9:05 AM, Petr Janda
<elekktretterr at exemail.com.au> wrote:
> Hi Sephe,
> Ive just got a panic on the mailserver. saying:
>
> panic: assertion, m == NULL in ether_input_chain2
>
> Attached is an image of the panic.
> Can you fix it? Thanks a lot.

Try the attached patch.

Best Regards,
sephe

-- 
Live Free or Die
Index: if_ethersubr.c
===================================================================
RCS file: /dcvs/src/sys/net/if_ethersubr.c,v
retrieving revision 1.76
diff -u -p -r1.76 if_ethersubr.c
--- if_ethersubr.c	8 Jul 2008 13:50:52 -0000	1.76
+++ if_ethersubr.c	24 Jul 2008 01:56:50 -0000
@@ -1658,11 +1658,8 @@ ether_init_netpacket(int num, struct mbu
 }
 
 static __inline struct lwkt_port *
-ether_mport(int num, struct mbuf **m0)
+ether_mport(int num, struct mbuf **m)
 {
-	struct lwkt_port *port;
-	struct mbuf *m = *m0;
-
 	if (num == NETISR_MAX) {
 		/*
 		 * All packets whose target msgports can't be
@@ -1671,13 +1668,7 @@ ether_mport(int num, struct mbuf **m0)
 		 */
 		return cpu_portfn(0);
 	}
-
-	port = netisr_find_port(num, &m);
-	if (port == NULL)
-		return NULL;
-
-	*m0 = m;
-	return port;
+	return netisr_find_port(num, m);
 }
 
 void