From 9f6283fce88f3aebf43a0c3941b77e1781453dc0 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Sat, 9 Mar 2013 05:57:00 +0000
Subject: [PATCH] --- yaml --- r: 368174 b: refs/heads/master c:
 22c352195ee09dcce9f4f0e2d4cd5f382b90f0fb h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv6/addrlabel.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d8f5a1724154..0eda930df615 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aed0c8bf7d2f389b472834053eb6e3bd6926999
+refs/heads/master: 22c352195ee09dcce9f4f0e2d4cd5f382b90f0fb
diff --git a/trunk/net/ipv6/addrlabel.c b/trunk/net/ipv6/addrlabel.c
index aad64352cb60..6f226c850c91 100644
--- a/trunk/net/ipv6/addrlabel.c
+++ b/trunk/net/ipv6/addrlabel.c
@@ -436,10 +436,7 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,
 
 	if (!tb[IFAL_ADDRESS])
 		return -EINVAL;
-
 	pfx = nla_data(tb[IFAL_ADDRESS]);
-	if (!pfx)
-		return -EINVAL;
 
 	if (!tb[IFAL_LABEL])
 		return -EINVAL;
@@ -561,10 +558,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr* nlh,
 
 	if (!tb[IFAL_ADDRESS])
 		return -EINVAL;
-
 	addr = nla_data(tb[IFAL_ADDRESS]);
-	if (!addr)
-		return -EINVAL;
 
 	rcu_read_lock();
 	p = __ipv6_addr_label(net, addr, ipv6_addr_type(addr), ifal->ifal_index);