[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/FC-4 linux-2.6-net-bridge-feature-consolidation.patch, NONE, 1.1 kernel-2.6.spec, 1.1522, 1.1523



Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv30126

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-net-bridge-feature-consolidation.patch 
Log Message:
Fix feature consolidation in bridge driver.



linux-2.6-net-bridge-feature-consolidation.patch:
 br_if.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE linux-2.6-net-bridge-feature-consolidation.patch ---
--- linux-2.6.14/net/bridge/br_if.c~	2005-11-29 18:53:17.000000000 -0500
+++ linux-2.6.14/net/bridge/br_if.c	2005-11-29 18:53:29.000000000 -0500
@@ -366,6 +366,7 @@ int br_add_if(struct net_bridge *br, str
 
 		spin_lock_bh(&br->lock);
 		br_stp_recalculate_bridge_id(br);
+		br_features_recompute(br);
 		if ((br->dev->flags & IFF_UP) 
 		    && (dev->flags & IFF_UP) && netif_carrier_ok(dev))
 			br_stp_enable_port(p);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1522
retrieving revision 1.1523
diff -u -r1.1522 -r1.1523
--- kernel-2.6.spec	29 Nov 2005 23:18:46 -0000	1.1522
+++ kernel-2.6.spec	29 Nov 2005 23:55:58 -0000	1.1523
@@ -346,6 +346,7 @@
 Patch1762: linux-2.6-i8k-dmi.patch
 Patch1770: linux-2.6-sata-locking-fix.patch
 Patch1780: linux-2.6-net-bonding-feature-consolidation.patch
+Patch1781: linux-2.6-net-bridge-feature-consolidation.patch
 
 
 # ACPI patches.
@@ -794,8 +795,9 @@
 %patch1762 -p1
 # Fix locking in SATA
 %patch1770 -p1
-# Fix feature consolidation in bonding driver.
+# Fix feature consolidation in bonding/bridge driver.
 %patch1780 -p1
+%patch1781 -p1
 
 # ACPI patches.
 # Enable EC burst
@@ -1266,7 +1268,7 @@
 
 %changelog
 * Mon Nov 28 2005 Dave Jones <davej redhat com> [2.6.14-1.1647_FC4]
-- Fix feature consolidation in bonding driver.
+- Fix feature consolidation in bonding & bridging code.
 
 * Mon Nov 28 2005 Dave Jones <davej redhat com> [2.6.14-1.1646_FC4]
 - Fix SATA locking.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]