Merge bk://kernel.bkbits.net/davem/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

net/ipv6/tcp_ipv6.c

@@ -479,7 +479,7 @@ static int tcp_v6_check_established(struct sock *sk)
 
 	/* And established part... */
 	sk_for_each(sk2, node, &head->chain) {
-		if(TCP_IPV6_MATCH(sk, saddr, daddr, ports, dif))
+		if(TCP_IPV6_MATCH(sk2, saddr, daddr, ports, dif))
 			goto not_unique;
 	}
 

net/netlink/af_netlink.c

@@ -543,7 +543,7 @@ int netlink_unicast(struct sock *ssk, struct sk_buff *skb, u32 pid, int nonblock
 	sk = netlink_getsockbypid(ssk, pid);
 	if (IS_ERR(sk)) {
 		kfree_skb(skb);
-		return PTR_ERR(skb);
+		return PTR_ERR(sk);
 	}
 	err = netlink_attachskb(sk, skb, nonblock, timeo);
 	if (err == 1)