Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (c5bfdb72) · Commits · e / devices / android_kernel_sony_msm8998

net/sctp/ipv6.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -360,7 +360,7 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
		return;
		}

		read_lock(&in6_dev->lock);
		read_lock_bh(&in6_dev->lock);
		for (ifp = in6_dev->addr_list; ifp; ifp = ifp->if_next) {
		/* Add the address to the local list. */
		addr = t_new(struct sctp_sockaddr_entry, GFP_ATOMIC);
		@@ -374,7 +374,7 @@ static void sctp_v6_copy_addrlist(struct list_head *addrlist,
		}
		}

		read_unlock(&in6_dev->lock);
		read_unlock_bh(&in6_dev->lock);
		rcu_read_unlock();
		}