From 1b52b1e09648ae07e4f2d36f92cce8206d149c98 Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Wed, 6 Mar 2013 11:45:24 +0000 Subject: [PATCH] --- yaml --- r: 361103 b: refs/heads/master c: 0c1233aba1e948c37f6dc7620cb7c253fcd71ce9 h: refs/heads/master i: 361101: 89ac4bfb378160a15d0554ae65c41080714e29b8 361099: 660f9096104b79434b479fe32ea3eaca335eaeb3 361095: 59fd5271d27b831acc0ec37c25b3c22bd6b86a04 361087: d740de2b49f8fbee8c3856955dab6472785531ea v: v3 --- [refs] | 2 +- trunk/net/netlabel/netlabel_unlabeled.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 3f080981c2f5..f6e15f66cf5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 260055bb1f1f8b5328601816c50fd7e0dfda7dff +refs/heads/master: 0c1233aba1e948c37f6dc7620cb7c253fcd71ce9 diff --git a/trunk/net/netlabel/netlabel_unlabeled.c b/trunk/net/netlabel/netlabel_unlabeled.c index 847d495cd4de..85742b76eb3e 100644 --- a/trunk/net/netlabel/netlabel_unlabeled.c +++ b/trunk/net/netlabel/netlabel_unlabeled.c @@ -1250,10 +1250,10 @@ static int netlbl_unlabel_staticlist(struct sk_buff *skb, unlabel_staticlist_return: rcu_read_unlock(); - cb->args[0] = skip_bkt; - cb->args[1] = skip_chain; - cb->args[2] = skip_addr4; - cb->args[3] = skip_addr6; + cb->args[0] = iter_bkt; + cb->args[1] = iter_chain; + cb->args[2] = iter_addr4; + cb->args[3] = iter_addr6; return skb->len; } @@ -1320,8 +1320,8 @@ static int netlbl_unlabel_staticlistdef(struct sk_buff *skb, unlabel_staticlistdef_return: rcu_read_unlock(); - cb->args[0] = skip_addr4; - cb->args[1] = skip_addr6; + cb->args[0] = iter_addr4; + cb->args[1] = iter_addr6; return skb->len; }