Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

torvalds · torvalds · commit b91ce4d14a21 · 2010-04-25T16:28:56.000-07:00
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  ipv6: Fix inet6_csk_bind_conflict()
  e100: Fix the TX workqueue race
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
@@ -166,6 +166,7 @@
 #include <linux/ethtool.h>
 #include <linux/string.h>
 #include <linux/firmware.h>
+#include <linux/rtnetlink.h>
 #include <asm/unaligned.h>
 
 
@@ -2265,8 +2266,13 @@ static void e100_tx_timeout_task(struct work_struct *work)
 
 	DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
 		ioread8(&nic->csr->scb.status));
-	e100_down(netdev_priv(netdev));
-	e100_up(netdev_priv(netdev));
+
+	rtnl_lock();
+	if (netif_running(netdev)) {
+		e100_down(netdev_priv(netdev));
+		e100_up(netdev_priv(netdev));
+	}
+	rtnl_unlock();
 }
 
 static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
@@ -48,7 +48,7 @@ int inet6_csk_bind_conflict(const struct sock *sk,
 			     ipv6_rcv_saddr_equal(sk, sk2))
 				break;
 			else if (sk->sk_reuse && sk2->sk_reuse &&
-				!ipv6_addr_any(inet6_rcv_saddr(sk2)) &&
+				!ipv6_addr_any(inet6_rcv_saddr(sk)) &&
 				ipv6_rcv_saddr_equal(sk, sk2))
 				break;
 		}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ int inet6_csk_bind_conflict(const struct sock *sk,`
`48`	`48`	`ipv6_rcv_saddr_equal(sk, sk2))`
`49`	`49`	`break;`
`50`	`50`	`else if (sk->sk_reuse && sk2->sk_reuse &&`
`51`		`- !ipv6_addr_any(inet6_rcv_saddr(sk2)) &&`
	`51`	`+ !ipv6_addr_any(inet6_rcv_saddr(sk)) &&`
`52`	`52`	`ipv6_rcv_saddr_equal(sk, sk2))`
`53`	`53`	`break;`
`54`	`54`	`}`