r3412 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Simon Horman]

Author: horms
Date: 2005-06-30 06:16:34 +0000 (Thu, 30 Jun 2005)
New Revision: 3412

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/net-bridge-mangle-oops-2.dpatch
Log:
I think this is closer to rcu_dereference() than the previous attempt

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/net-bridge-mangle-oops-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/net-bridge-mangle-oops-2.dpatch	2005-06-30 06:12:44 UTC (rev 3411)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/net-bridge-mangle-oops-2.dpatch	2005-06-30 06:16:34 UTC (rev 3412)
@@ -5,9 +5,9 @@
 #   
 #   Signed-off-by: Horms <horms@debian.org>
 #
---- a/net/core/dev.c.orig	2005-06-30 15:04:16.000000000 +0900
-+++ b/net/core/dev.c	2005-06-30 15:07:24.000000000 +0900
-@@ -1691,8 +1691,11 @@
+--- a/net/core/dev.c	2005-06-30 15:04:16.000000000 +0900
++++ b/net/core/dev.c	2005-06-30 15:15:37.000000000 +0900
+@@ -1691,8 +1691,12 @@
  {
  	struct net_bridge_port *port;
  
@@ -16,8 +16,9 @@
 +	if ((*pskb)->pkt_type == PACKET_LOOPBACK)
 +		return 0;
 +
++	port = (*pskb)->dev->br_port;
 +	smp_read_barrier_depends();
-+	if ((port = (*pskb)->dev->br_port) == NULL)
++	if (port == NULL)
  		return 0;
  
  	if (*pt_prev) {