summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPetr Holasek <pholasek@redhat.com>2013-08-30 17:02:38 +0200
committerDavid S. Miller <davem@davemloft.net>2013-09-04 04:16:50 +0200
commit13c7bf0871509723a2b3c054d3d6e9e506464e71 (patch)
tree124cab2555d4283c3a211bd76ab91b8a55bdbec8 /net
parentICMPv6: treat dest unreachable codes 5 and 6 as EACCES, not EPROTO (diff)
downloadlinux-13c7bf0871509723a2b3c054d3d6e9e506464e71.tar.xz
linux-13c7bf0871509723a2b3c054d3d6e9e506464e71.zip
ipv6: ipv6_create_tempaddr cleanup
This two-liner removes max_addresses variable which is now unecessary related to patch [ipv6: remove max_addresses check from ipv6_create_tempaddr]. Signed-off-by: Petr Holasek <pholasek@redhat.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Acked-by: Ding Tianhong <dingtianhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/addrconf.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 498ea99194af..05c83dd54a4d 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1054,7 +1054,6 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, struct inet6_ifaddr *i
unsigned long regen_advance;
int tmp_plen;
int ret = 0;
- int max_addresses;
u32 addr_flags;
unsigned long now = jiffies;
@@ -1100,7 +1099,6 @@ retry:
idev->cnf.temp_prefered_lft + age -
idev->cnf.max_desync_factor);
tmp_plen = ifp->prefix_len;
- max_addresses = idev->cnf.max_addresses;
tmp_tstamp = ifp->tstamp;
spin_unlock_bh(&ifp->lock);