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
fcd7074e
Commit
fcd7074e
authored
Dec 04, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
58392dbd
a550a014
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
net/bridge/br_netfilter.c
net/bridge/br_netfilter.c
+1
-1
net/ipv4/netfilter/ip_conntrack_standalone.c
net/ipv4/netfilter/ip_conntrack_standalone.c
+2
-1
No files found.
net/bridge/br_netfilter.c
View file @
fcd7074e
...
...
@@ -180,7 +180,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb)
struct
rtable
*
rt
;
struct
flowi
fl
=
{
.
nl_u
=
{
.
ip4_u
=
{
.
daddr
=
iph
->
daddr
,
.
saddr
=
0
,
.
tos
=
iph
->
tos
}
},
.
proto
=
0
};
.
tos
=
RT_TOS
(
iph
->
tos
)
}
},
.
proto
=
0
};
if
(
!
ip_route_output_key
(
&
rt
,
&
fl
))
{
/* Bridged-and-DNAT'ed traffic doesn't
...
...
net/ipv4/netfilter/ip_conntrack_standalone.c
View file @
fcd7074e
...
...
@@ -201,7 +201,8 @@ static unsigned int ip_refrag(unsigned int hooknum,
/* Local packets are never produced too large for their
interface. We degfragment them at LOCAL_OUT, however,
so we have to refragment them here. */
if
((
*
pskb
)
->
len
>
dst_pmtu
(
&
rt
->
u
.
dst
))
{
if
((
*
pskb
)
->
len
>
dst_pmtu
(
&
rt
->
u
.
dst
)
&&
!
skb_shinfo
(
*
pskb
)
->
tso_size
)
{
/* No hook can be after us, so this should be OK. */
ip_fragment
(
*
pskb
,
okfn
);
return
NF_STOLEN
;
...
...
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