Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
cf22f9a2
Commit
cf22f9a2
authored
Apr 14, 2012
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ipv6: Remove unused argument to addrconf_dad_start().
Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
fd9071ec
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
net/ipv6/addrconf.c
net/ipv6/addrconf.c
+6
-6
No files found.
net/ipv6/addrconf.c
View file @
cf22f9a2
...
@@ -149,7 +149,7 @@ static void addrconf_type_change(struct net_device *dev,
...
@@ -149,7 +149,7 @@ static void addrconf_type_change(struct net_device *dev,
unsigned
long
event
);
unsigned
long
event
);
static
int
addrconf_ifdown
(
struct
net_device
*
dev
,
int
how
);
static
int
addrconf_ifdown
(
struct
net_device
*
dev
,
int
how
);
static
void
addrconf_dad_start
(
struct
inet6_ifaddr
*
ifp
,
u32
flags
);
static
void
addrconf_dad_start
(
struct
inet6_ifaddr
*
ifp
);
static
void
addrconf_dad_timer
(
unsigned
long
data
);
static
void
addrconf_dad_timer
(
unsigned
long
data
);
static
void
addrconf_dad_completed
(
struct
inet6_ifaddr
*
ifp
);
static
void
addrconf_dad_completed
(
struct
inet6_ifaddr
*
ifp
);
static
void
addrconf_dad_run
(
struct
inet6_dev
*
idev
);
static
void
addrconf_dad_run
(
struct
inet6_dev
*
idev
);
...
@@ -929,7 +929,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, struct inet6_ifaddr *i
...
@@ -929,7 +929,7 @@ static int ipv6_create_tempaddr(struct inet6_ifaddr *ifp, struct inet6_ifaddr *i
ift
->
tstamp
=
tmp_tstamp
;
ift
->
tstamp
=
tmp_tstamp
;
spin_unlock_bh
(
&
ift
->
lock
);
spin_unlock_bh
(
&
ift
->
lock
);
addrconf_dad_start
(
ift
,
0
);
addrconf_dad_start
(
ift
);
in6_ifa_put
(
ift
);
in6_ifa_put
(
ift
);
in6_dev_put
(
idev
);
in6_dev_put
(
idev
);
out:
out:
...
@@ -1959,7 +1959,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)
...
@@ -1959,7 +1959,7 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao)
update_lft
=
create
=
1
;
update_lft
=
create
=
1
;
ifp
->
cstamp
=
jiffies
;
ifp
->
cstamp
=
jiffies
;
addrconf_dad_start
(
ifp
,
RTF_ADDRCONF
|
RTF_PREFIX_RT
);
addrconf_dad_start
(
ifp
);
}
}
if
(
ifp
)
{
if
(
ifp
)
{
...
@@ -2238,7 +2238,7 @@ static int inet6_addr_add(struct net *net, int ifindex, const struct in6_addr *p
...
@@ -2238,7 +2238,7 @@ static int inet6_addr_add(struct net *net, int ifindex, const struct in6_addr *p
* that the Optimistic flag should not be set for
* that the Optimistic flag should not be set for
* manually configured addresses
* manually configured addresses
*/
*/
addrconf_dad_start
(
ifp
,
0
);
addrconf_dad_start
(
ifp
);
in6_ifa_put
(
ifp
);
in6_ifa_put
(
ifp
);
addrconf_verify
(
0
);
addrconf_verify
(
0
);
return
0
;
return
0
;
...
@@ -2425,7 +2425,7 @@ static void addrconf_add_linklocal(struct inet6_dev *idev, const struct in6_addr
...
@@ -2425,7 +2425,7 @@ static void addrconf_add_linklocal(struct inet6_dev *idev, const struct in6_addr
ifp
=
ipv6_add_addr
(
idev
,
addr
,
64
,
IFA_LINK
,
addr_flags
);
ifp
=
ipv6_add_addr
(
idev
,
addr
,
64
,
IFA_LINK
,
addr_flags
);
if
(
!
IS_ERR
(
ifp
))
{
if
(
!
IS_ERR
(
ifp
))
{
addrconf_prefix_route
(
&
ifp
->
addr
,
ifp
->
prefix_len
,
idev
->
dev
,
0
,
0
);
addrconf_prefix_route
(
&
ifp
->
addr
,
ifp
->
prefix_len
,
idev
->
dev
,
0
,
0
);
addrconf_dad_start
(
ifp
,
0
);
addrconf_dad_start
(
ifp
);
in6_ifa_put
(
ifp
);
in6_ifa_put
(
ifp
);
}
}
}
}
...
@@ -2920,7 +2920,7 @@ static void addrconf_dad_kick(struct inet6_ifaddr *ifp)
...
@@ -2920,7 +2920,7 @@ static void addrconf_dad_kick(struct inet6_ifaddr *ifp)
addrconf_mod_timer
(
ifp
,
AC_DAD
,
rand_num
);
addrconf_mod_timer
(
ifp
,
AC_DAD
,
rand_num
);
}
}
static
void
addrconf_dad_start
(
struct
inet6_ifaddr
*
ifp
,
u32
flags
)
static
void
addrconf_dad_start
(
struct
inet6_ifaddr
*
ifp
)
{
{
struct
inet6_dev
*
idev
=
ifp
->
idev
;
struct
inet6_dev
*
idev
=
ifp
->
idev
;
struct
net_device
*
dev
=
idev
->
dev
;
struct
net_device
*
dev
=
idev
->
dev
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment