bridge-patch.diff

   1 --- linux-2.6.32/net/bridge/br_stp_if.c.org     2010-01-15 09:38:09.000000000 +0100
   2 +++ linux-2.6.32/net/bridge/br_stp_if.c 2010-01-15 09:38:57.000000000 +0100
   3 @@ -219,10 +219,7 @@ void br_stp_recalculate_bridge_id(struct
   4                 return;
   5
   6         list_for_each_entry(p, &br->port_list, list) {
   7 -               if (addr == br_mac_zero ||
   8 -                   memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
   9 -                       addr = p->dev->dev_addr;
  10 -
  11 +               addr = p->dev->dev_addr;
  12         }
  13
  14         if (compare_ether_addr(br->bridge_id.addr, addr))