diff options
| author | Mathias Krause <minipli@googlemail.com> | 2013-03-09 06:57:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-10 21:46:09 +0100 |
| commit | 22c352195ee09dcce9f4f0e2d4cd5f382b90f0fb (patch) | |
| tree | c061babed893a4d968b871b2c31d0c0f1434598e /net/ipv6/addrlabel.c | |
| parent | tunnel: use iptunnel_xmit() again (diff) | |
| download | linux-22c352195ee09dcce9f4f0e2d4cd5f382b90f0fb.tar.xz linux-22c352195ee09dcce9f4f0e2d4cd5f382b90f0fb.zip | |
ipv6: remove superfluous nla_data() NULL pointer checks
nla_data() cannot return NULL, so these NULL pointer checks are
superfluous.
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrlabel.c')
| -rw-r--r-- | net/ipv6/addrlabel.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c index aad64352cb60..6f226c850c91 100644 --- a/net/ipv6/addrlabel.c +++ b/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); |