Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
R128
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ermine
R128
Commits
e807e566
Commit
e807e566
authored
13 years ago
by
David S. Miller
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
git://1984.lsi.us.es/net
parents
bff52857
7d367e06
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/net/netfilter/nf_conntrack.h
+1
-1
1 addition, 1 deletion
include/net/netfilter/nf_conntrack.h
net/netfilter/nf_conntrack_core.c
+34
-4
34 additions, 4 deletions
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c
+4
-7
4 additions, 7 deletions
net/netfilter/nf_conntrack_netlink.c
with
39 additions
and
12 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
