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
848fc2bc
Commit
848fc2bc
authored
Nov 21, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/davem/BK/sparc-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
64ef3596
eb05aab5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
net/ipv4/igmp.c
net/ipv4/igmp.c
+2
-1
net/ipv6/mcast.c
net/ipv6/mcast.c
+10
-4
No files found.
net/ipv4/igmp.c
View file @
848fc2bc
...
...
@@ -90,6 +90,7 @@
#include <linux/igmp.h>
#include <linux/if_arp.h>
#include <linux/rtnetlink.h>
#include <linux/times.h>
#include <net/ip.h>
#include <net/protocol.h>
#include <net/route.h>
...
...
@@ -2215,7 +2216,7 @@ static int igmp_mc_seq_show(struct seq_file *seq, void *v)
seq_printf
(
seq
,
"
\t\t\t\t
%08lX %5d %d:%08lX
\t\t
%d
\n
"
,
im
->
multiaddr
,
im
->
users
,
im
->
tm_running
,
im
->
timer
.
expires
-
jiffies
,
im
->
reporter
);
im
->
tm_running
,
jiffies_to_clock_t
(
im
->
timer
.
expires
-
jiffies
)
,
im
->
reporter
);
}
return
0
;
}
...
...
net/ipv6/mcast.c
View file @
848fc2bc
...
...
@@ -36,6 +36,7 @@
#include <linux/socket.h>
#include <linux/sockios.h>
#include <linux/jiffies.h>
#include <linux/times.h>
#include <linux/net.h>
#include <linux/in.h>
#include <linux/in6.h>
...
...
@@ -960,8 +961,9 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime)
{
unsigned
long
delay
=
resptime
;
/* Do not start timer for addresses with link/host scope */
if
(
ipv6_addr_type
(
&
ma
->
mca_addr
)
&
(
IPV6_ADDR_LINKLOCAL
|
IPV6_ADDR_LOOPBACK
))
/* Do not start timer for these addresses */
if
(
ipv6_addr_is_ll_all_nodes
(
&
ma
->
mca_addr
)
||
IPV6_ADDR_MC_SCOPE
(
&
ma
->
mca_addr
)
<
IPV6_ADDR_SCOPE_LINKLOCAL
)
return
;
if
(
del_timer
(
&
ma
->
mca_timer
))
{
...
...
@@ -978,6 +980,7 @@ static void igmp6_group_queried(struct ifmcaddr6 *ma, unsigned long resptime)
ma
->
mca_timer
.
expires
=
jiffies
+
delay
;
if
(
!
mod_timer
(
&
ma
->
mca_timer
,
jiffies
+
delay
))
atomic_inc
(
&
ma
->
mca_refcnt
);
ma
->
mca_flags
|=
MAF_TIMER_RUNNING
;
}
static
void
mld_marksources
(
struct
ifmcaddr6
*
pmc
,
int
nsrcs
,
...
...
@@ -1014,7 +1017,9 @@ int igmp6_event_query(struct sk_buff *skb)
if
(
!
pskb_may_pull
(
skb
,
sizeof
(
struct
in6_addr
)))
return
-
EINVAL
;
len
=
ntohs
(
skb
->
nh
.
ipv6h
->
payload_len
);
/* compute payload length excluding extension headers */
len
=
ntohs
(
skb
->
nh
.
ipv6h
->
payload_len
)
+
sizeof
(
struct
ipv6hdr
);
len
-=
(
char
*
)
skb
->
h
.
raw
-
(
char
*
)
skb
->
nh
.
ipv6h
;
/* Drop queries with not link local source */
if
(
!
(
ipv6_addr_type
(
&
skb
->
nh
.
ipv6h
->
saddr
)
&
IPV6_ADDR_LINKLOCAL
))
...
...
@@ -2157,7 +2162,8 @@ static int igmp6_mc_seq_show(struct seq_file *seq, void *v)
state
->
dev
->
ifindex
,
state
->
dev
->
name
,
NIP6
(
im
->
mca_addr
),
im
->
mca_users
,
im
->
mca_flags
,
(
im
->
mca_flags
&
MAF_TIMER_RUNNING
)
?
im
->
mca_timer
.
expires
-
jiffies
:
0
);
(
im
->
mca_flags
&
MAF_TIMER_RUNNING
)
?
jiffies_to_clock_t
(
im
->
mca_timer
.
expires
-
jiffies
)
:
0
);
return
0
;
}
...
...
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