Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

R

R128
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

4a2258dd

Commit 4a2258dd authored 13 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'nf' of git://1984.lsi.us.es/net

parents ee932bf9 af14cca1

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/netfilter_bridge/ebtables.h 2 additions, 2 deletions

include/linux/netfilter_bridge/ebtables.h
net/netfilter/ipvs/ip_vs_core.c 1 addition, 1 deletion

net/netfilter/ipvs/ip_vs_core.c
net/netfilter/nf_conntrack_netlink.c 16 additions, 27 deletions

net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_queue.c 32 additions, 8 deletions

net/netfilter/nf_queue.c

with 51 additions and 38 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