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
Kirill Smelkov
linux
Commits
0e7ee1c1
Commit
0e7ee1c1
authored
Aug 21, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
9f4a648b
2b50fcaa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
11 deletions
+23
-11
include/linux/pkt_sched.h
include/linux/pkt_sched.h
+1
-1
net/ipv6/mcast.c
net/ipv6/mcast.c
+22
-10
No files found.
include/linux/pkt_sched.h
View file @
0e7ee1c1
...
@@ -45,7 +45,7 @@ struct tc_stats
...
@@ -45,7 +45,7 @@ struct tc_stats
struct
tc_estimator
struct
tc_estimator
{
{
char
interval
;
signed
char
interval
;
unsigned
char
ewma_log
;
unsigned
char
ewma_log
;
};
};
...
...
net/ipv6/mcast.c
View file @
0e7ee1c1
...
@@ -854,15 +854,10 @@ int ipv6_dev_mc_inc(struct net_device *dev, struct in6_addr *addr)
...
@@ -854,15 +854,10 @@ int ipv6_dev_mc_inc(struct net_device *dev, struct in6_addr *addr)
/*
/*
* device multicast group del
* device multicast group del
*/
*/
int
ipv6_dev_mc_dec
(
struct
net_device
*
dev
,
struct
in6_addr
*
addr
)
static
int
__ipv6_dev_mc_dec
(
struct
net_device
*
dev
,
struct
inet6_dev
*
i
dev
,
struct
in6_addr
*
addr
)
{
{
struct
inet6_dev
*
idev
;
struct
ifmcaddr6
*
ma
,
**
map
;
struct
ifmcaddr6
*
ma
,
**
map
;
idev
=
in6_dev_get
(
dev
);
if
(
idev
==
NULL
)
return
-
ENODEV
;
write_lock_bh
(
&
idev
->
lock
);
write_lock_bh
(
&
idev
->
lock
);
for
(
map
=
&
idev
->
mc_list
;
(
ma
=*
map
)
!=
NULL
;
map
=
&
ma
->
next
)
{
for
(
map
=
&
idev
->
mc_list
;
(
ma
=*
map
)
!=
NULL
;
map
=
&
ma
->
next
)
{
if
(
ipv6_addr_cmp
(
&
ma
->
mca_addr
,
addr
)
==
0
)
{
if
(
ipv6_addr_cmp
(
&
ma
->
mca_addr
,
addr
)
==
0
)
{
...
@@ -873,20 +868,32 @@ int ipv6_dev_mc_dec(struct net_device *dev, struct in6_addr *addr)
...
@@ -873,20 +868,32 @@ int ipv6_dev_mc_dec(struct net_device *dev, struct in6_addr *addr)
igmp6_group_dropped
(
ma
);
igmp6_group_dropped
(
ma
);
ma_put
(
ma
);
ma_put
(
ma
);
in6_dev_put
(
idev
);
return
0
;
return
0
;
}
}
write_unlock_bh
(
&
idev
->
lock
);
write_unlock_bh
(
&
idev
->
lock
);
in6_dev_put
(
idev
);
return
0
;
return
0
;
}
}
}
}
write_unlock_bh
(
&
idev
->
lock
);
write_unlock_bh
(
&
idev
->
lock
);
in6_dev_put
(
idev
);
return
-
ENOENT
;
return
-
ENOENT
;
}
}
int
ipv6_dev_mc_dec
(
struct
net_device
*
dev
,
struct
in6_addr
*
addr
)
{
struct
inet6_dev
*
idev
=
in6_dev_get
(
dev
);
int
err
;
if
(
!
idev
)
return
-
ENODEV
;
err
=
__ipv6_dev_mc_dec
(
dev
,
idev
,
addr
);
in6_dev_put
(
idev
);
return
err
;
}
/*
/*
* check if the interface/address pair is valid
* check if the interface/address pair is valid
*/
*/
...
@@ -2024,7 +2031,12 @@ void ipv6_mc_destroy_dev(struct inet6_dev *idev)
...
@@ -2024,7 +2031,12 @@ void ipv6_mc_destroy_dev(struct inet6_dev *idev)
/* Delete all-nodes address. */
/* Delete all-nodes address. */
ipv6_addr_all_nodes
(
&
maddr
);
ipv6_addr_all_nodes
(
&
maddr
);
ipv6_dev_mc_dec
(
idev
->
dev
,
&
maddr
);
/* We cannot call ipv6_dev_mc_dec() directly, our caller in
* addrconf.c has NULL'd out dev->ip6_ptr so in6_dev_get() will
* fail.
*/
__ipv6_dev_mc_dec
(
idev
->
dev
,
idev
,
&
maddr
);
write_lock_bh
(
&
idev
->
lock
);
write_lock_bh
(
&
idev
->
lock
);
while
((
i
=
idev
->
mc_list
)
!=
NULL
)
{
while
((
i
=
idev
->
mc_list
)
!=
NULL
)
{
...
...
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