aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorPetr Holasek <pholasek@redhat.com>2013-08-30 11:02:38 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-03 22:16:50 -0400
commit13c7bf0871509723a2b3c054d3d6e9e506464e71 (patch)
tree124cab2555d4283c3a211bd76ab91b8a55bdbec8 /net/ipv6
parent61e76b178dbe7145e8d6afa84bb4ccea71918994 (diff)
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/ipv6')
-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
1054 unsigned long regen_advance; 1054 unsigned long regen_advance;
1055 int tmp_plen; 1055 int tmp_plen;
1056 int ret = 0; 1056 int ret = 0;
1057 int max_addresses;
1058 u32 addr_flags; 1057 u32 addr_flags;
1059 unsigned long now = jiffies; 1058 unsigned long now = jiffies;
1060 1059
@@ -1100,7 +1099,6 @@ retry:
1100 idev->cnf.temp_prefered_lft + age - 1099 idev->cnf.temp_prefered_lft + age -
1101 idev->cnf.max_desync_factor); 1100 idev->cnf.max_desync_factor);
1102 tmp_plen = ifp->prefix_len; 1101 tmp_plen = ifp->prefix_len;
1103 max_addresses = idev->cnf.max_addresses;
1104 tmp_tstamp = ifp->tstamp; 1102 tmp_tstamp = ifp->tstamp;
1105 spin_unlock_bh(&ifp->lock); 1103 spin_unlock_bh(&ifp->lock);
1106 1104