Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
14ee0a14
Commit
14ee0a14
authored
Dec 12, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/nf-2.6
parents
225bc8f1
2f9616d4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
net/ipv4/netfilter/ip_nat_tftp.c
net/ipv4/netfilter/ip_nat_tftp.c
+4
-1
No files found.
net/ipv4/netfilter/ip_nat_tftp.c
View file @
14ee0a14
...
...
@@ -42,7 +42,10 @@ static unsigned int help(struct sk_buff **pskb,
enum
ip_conntrack_info
ctinfo
,
struct
ip_conntrack_expect
*
exp
)
{
exp
->
saved_proto
.
udp
.
port
=
exp
->
tuple
.
dst
.
u
.
tcp
.
port
;
struct
ip_conntrack
*
ct
=
exp
->
master
;
exp
->
saved_proto
.
udp
.
port
=
ct
->
tuplehash
[
IP_CT_DIR_ORIGINAL
].
tuple
.
src
.
u
.
udp
.
port
;
exp
->
dir
=
IP_CT_DIR_REPLY
;
exp
->
expectfn
=
ip_nat_follow_master
;
if
(
ip_conntrack_expect_related
(
exp
)
!=
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