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
791f58c0
Commit
791f58c0
authored
Apr 15, 2010
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
parents
fd793d89
8de53dfb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
net/ipv4/Kconfig
net/ipv4/Kconfig
+1
-1
net/ipv4/ipmr.c
net/ipv4/ipmr.c
+8
-2
No files found.
net/ipv4/Kconfig
View file @
791f58c0
...
@@ -252,7 +252,7 @@ config IP_MROUTE
...
@@ -252,7 +252,7 @@ config IP_MROUTE
config IP_MROUTE_MULTIPLE_TABLES
config IP_MROUTE_MULTIPLE_TABLES
bool "IP: multicast policy routing"
bool "IP: multicast policy routing"
depends on IP_ADVANCED_ROUTER
depends on IP_
MROUTE && IP_
ADVANCED_ROUTER
select FIB_RULES
select FIB_RULES
help
help
Normally, a multicast router runs a userspace daemon and decides
Normally, a multicast router runs a userspace daemon and decides
...
...
net/ipv4/ipmr.c
View file @
791f58c0
...
@@ -71,6 +71,9 @@
...
@@ -71,6 +71,9 @@
struct
mr_table
{
struct
mr_table
{
struct
list_head
list
;
struct
list_head
list
;
#ifdef CONFIG_NET_NS
struct
net
*
net
;
#endif
u32
id
;
u32
id
;
struct
sock
*
mroute_sk
;
struct
sock
*
mroute_sk
;
struct
timer_list
ipmr_expire_timer
;
struct
timer_list
ipmr_expire_timer
;
...
@@ -308,6 +311,7 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)
...
@@ -308,6 +311,7 @@ static struct mr_table *ipmr_new_table(struct net *net, u32 id)
mrt
=
kzalloc
(
sizeof
(
*
mrt
),
GFP_KERNEL
);
mrt
=
kzalloc
(
sizeof
(
*
mrt
),
GFP_KERNEL
);
if
(
mrt
==
NULL
)
if
(
mrt
==
NULL
)
return
NULL
;
return
NULL
;
write_pnet
(
&
mrt
->
net
,
net
);
mrt
->
id
=
id
;
mrt
->
id
=
id
;
/* Forwarding cache */
/* Forwarding cache */
...
@@ -580,7 +584,7 @@ static inline void ipmr_cache_free(struct mfc_cache *c)
...
@@ -580,7 +584,7 @@ static inline void ipmr_cache_free(struct mfc_cache *c)
static
void
ipmr_destroy_unres
(
struct
mr_table
*
mrt
,
struct
mfc_cache
*
c
)
static
void
ipmr_destroy_unres
(
struct
mr_table
*
mrt
,
struct
mfc_cache
*
c
)
{
{
struct
net
*
net
=
NULL
;
//mrt->net
;
struct
net
*
net
=
read_pnet
(
&
mrt
->
net
)
;
struct
sk_buff
*
skb
;
struct
sk_buff
*
skb
;
struct
nlmsgerr
*
e
;
struct
nlmsgerr
*
e
;
...
@@ -1089,12 +1093,14 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
...
@@ -1089,12 +1093,14 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
* Check to see if we resolved a queued list. If so we
* Check to see if we resolved a queued list. If so we
* need to send on the frames and tidy up.
* need to send on the frames and tidy up.
*/
*/
found
=
false
;
spin_lock_bh
(
&
mfc_unres_lock
);
spin_lock_bh
(
&
mfc_unres_lock
);
list_for_each_entry
(
uc
,
&
mrt
->
mfc_unres_queue
,
list
)
{
list_for_each_entry
(
uc
,
&
mrt
->
mfc_unres_queue
,
list
)
{
if
(
uc
->
mfc_origin
==
c
->
mfc_origin
&&
if
(
uc
->
mfc_origin
==
c
->
mfc_origin
&&
uc
->
mfc_mcastgrp
==
c
->
mfc_mcastgrp
)
{
uc
->
mfc_mcastgrp
==
c
->
mfc_mcastgrp
)
{
list_del
(
&
uc
->
list
);
list_del
(
&
uc
->
list
);
atomic_dec
(
&
mrt
->
cache_resolve_queue_len
);
atomic_dec
(
&
mrt
->
cache_resolve_queue_len
);
found
=
true
;
break
;
break
;
}
}
}
}
...
@@ -1102,7 +1108,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
...
@@ -1102,7 +1108,7 @@ static int ipmr_mfc_add(struct net *net, struct mr_table *mrt,
del_timer
(
&
mrt
->
ipmr_expire_timer
);
del_timer
(
&
mrt
->
ipmr_expire_timer
);
spin_unlock_bh
(
&
mfc_unres_lock
);
spin_unlock_bh
(
&
mfc_unres_lock
);
if
(
uc
)
{
if
(
found
)
{
ipmr_cache_resolve
(
net
,
mrt
,
uc
,
c
);
ipmr_cache_resolve
(
net
,
mrt
,
uc
,
c
);
ipmr_cache_free
(
uc
);
ipmr_cache_free
(
uc
);
}
}
...
...
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