diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2013-07-29 22:15:19 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-07-30 19:24:16 -0700 |
| commit | 4299c8a94fa9d26b54222d7781244137623d4b39 (patch) | |
| tree | acb059dbb51d5d83b5dedaf074256aba3d7fba80 /net/ipv4/devinet.c | |
| parent | flow_dissector: add support for IPPROTO_IPV6 (diff) | |
| download | linux-dev-4299c8a94fa9d26b54222d7781244137623d4b39.tar.xz linux-dev-4299c8a94fa9d26b54222d7781244137623d4b39.zip | |
net: remove an unneeded check
"ifa->ifa_label" is an array inside the in_ifaddr struct. It can never
be NULL so we can remove this check.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/devinet.c')
| -rw-r--r-- | net/ipv4/devinet.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 8d48c392adcc..1b7f7ae8514a 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -1124,10 +1124,7 @@ static int inet_gifconf(struct net_device *dev, char __user *buf, int len) if (len < (int) sizeof(ifr)) break; memset(&ifr, 0, sizeof(struct ifreq)); - if (ifa->ifa_label) - strcpy(ifr.ifr_name, ifa->ifa_label); - else - strcpy(ifr.ifr_name, dev->name); + strcpy(ifr.ifr_name, ifa->ifa_label); (*(struct sockaddr_in *)&ifr.ifr_addr).sin_family = AF_INET; (*(struct sockaddr_in *)&ifr.ifr_addr).sin_addr.s_addr = |