Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

134ffb4c

Commit 134ffb4c authored 15 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents 2238aff5 98d500d6

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/net/netfilter/nf_nat.h 1 addition, 0 deletions

include/net/netfilter/nf_nat.h
net/ipv4/netfilter/nf_nat_core.c 2 additions, 1 deletion

net/ipv4/netfilter/nf_nat_core.c
net/netfilter/nf_conntrack_helper.c 1 addition, 1 deletion

net/netfilter/nf_conntrack_helper.c
net/netfilter/nf_log.c 4 additions, 0 deletions

net/netfilter/nf_log.c

with 8 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment