Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

44d28ab1

Commit 44d28ab1 authored 16 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'net-next-2.6-v6ready-20080703' of...

Merge branch 'net-next-2.6-v6ready-20080703' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-next

parents 40b215e5 e0835f8f

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/networking/ip-sysctl.txt 11 additions, 0 deletions

Documentation/networking/ip-sysctl.txt
include/linux/igmp.h 0 additions, 1 deletion

include/linux/igmp.h
include/linux/ipv6.h 4 additions, 0 deletions

include/linux/ipv6.h
include/linux/mroute.h 27 additions, 1 deletion

include/linux/mroute.h
include/linux/mroute6.h 34 additions, 1 deletion

include/linux/mroute6.h
net/ipv4/af_inet.c 3 additions, 2 deletions

net/ipv4/af_inet.c
net/ipv4/ipmr.c 24 additions, 4 deletions

net/ipv4/ipmr.c
net/ipv6/addrconf.c 53 additions, 0 deletions

net/ipv6/addrconf.c
net/ipv6/af_inet6.c 6 additions, 5 deletions

net/ipv6/af_inet6.c
net/ipv6/ip6_input.c 2 additions, 1 deletion

net/ipv6/ip6_input.c
net/ipv6/ip6_output.c 9 additions, 1 deletion

net/ipv6/ip6_output.c
net/ipv6/ip6mr.c 33 additions, 5 deletions

net/ipv6/ip6mr.c
net/ipv6/route.c 17 additions, 5 deletions

net/ipv6/route.c

with 223 additions and 26 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