From: David S. Miller <davem@davemloft.net>
Date: Sat, 26 Nov 2011 19:47:03 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.3-rc1~182^2~499
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	net/ipv4/inet_diag.c
---

6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c
diff --cc net/netlabel/netlabel_kapi.c
index 8ed67dcc,7b372a7..3735297
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@@ -160,10 -160,10 +160,10 @@@ int netlbl_cfg_unlbl_map_add(const cha
  			map6->list.addr.s6_addr32[1] &= mask6->s6_addr32[1];
  			map6->list.addr.s6_addr32[2] &= mask6->s6_addr32[2];
  			map6->list.addr.s6_addr32[3] &= mask6->s6_addr32[3];
 -			ipv6_addr_copy(&map6->list.mask, mask6);
 +			map6->list.mask = *mask6;
  			map6->list.valid = 1;
- 			ret_val = netlbl_af4list_add(&map4->list,
- 						     &addrmap->list4);
+ 			ret_val = netlbl_af6list_add(&map6->list,
+ 						     &addrmap->list6);
  			if (ret_val != 0)
  				goto cfg_unlbl_map_add_failure;
  			break;