Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

ce7fa1b3

Commit ce7fa1b3 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents d898d485 9bffc4ac

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/rtnetlink.h 4 additions, 0 deletions

include/linux/rtnetlink.h
include/net/xfrm.h 1 addition, 0 deletions

include/net/xfrm.h
net/bridge/br_netfilter.c 7 additions, 10 deletions

net/bridge/br_netfilter.c
net/ipv4/netfilter/Makefile 2 additions, 1 deletion

net/ipv4/netfilter/Makefile
net/ipv4/xfrm4_policy.c 1 addition, 0 deletions

net/ipv4/xfrm4_policy.c
net/ipv6/addrconf.c 12 additions, 4 deletions

net/ipv6/addrconf.c
net/ipv6/netfilter/Kconfig 1 addition, 1 deletion

net/ipv6/netfilter/Kconfig
net/ipv6/route.c 1 addition, 1 deletion

net/ipv6/route.c
net/ipv6/xfrm6_policy.c 1 addition, 0 deletions

net/ipv6/xfrm6_policy.c
net/sctp/socket.c 3 additions, 11 deletions

net/sctp/socket.c
net/xfrm/xfrm_policy.c 14 additions, 5 deletions

net/xfrm/xfrm_policy.c
net/xfrm/xfrm_state.c 5 additions, 0 deletions

net/xfrm/xfrm_state.c

with 52 additions and 33 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