diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 20:47:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 20:47:03 +0100 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /net/netlabel | |
| parent | Merge branch 'for_david' of git://git.open-mesh.org/linux-merge (diff) | |
| parent | net: Revert ARCNET and PHYLIB to tristate options (diff) | |
| download | linux-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.tar.xz linux-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'net/netlabel')
| -rw-r--r-- | net/netlabel/netlabel_kapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c index 8ed67dccf11d..3735297c524d 100644 --- a/net/netlabel/netlabel_kapi.c +++ b/net/netlabel/netlabel_kapi.c @@ -162,8 +162,8 @@ int netlbl_cfg_unlbl_map_add(const char *domain, map6->list.addr.s6_addr32[3] &= mask6->s6_addr32[3]; 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; |