--- zzzz-none-000/linux-2.6.19.2/net/bridge/br_if.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/net/bridge/br_if.c	2008-05-21 08:34:11.000000000 +0000
@@ -35,7 +35,7 @@
  */
 static int port_cost(struct net_device *dev)
 {
-	struct ethtool_cmd ecmd = { ETHTOOL_GSET };
+	struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET };
 	struct ifreq ifr;
 	mm_segment_t old_fs;
 	int err;
@@ -126,6 +126,7 @@
 	struct net_device *dev = p->dev;
 
 	p->br = NULL;
+	p->dev->br_port = NULL;
 	p->dev = NULL;
 	dev_put(dev);