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

8eefca48

Commit 8eefca48 authored 17 years ago by David S. Miller

Downloads
- Plain Diff

Merge branch 'net-2.6.26-isatap-20080403' of...

Merge branch 'net-2.6.26-isatap-20080403' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev

parents 549e028d de357cc0

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/if_tunnel.h 19 additions, 3 deletions

include/linux/if_tunnel.h
include/linux/skbuff.h 4 additions, 1 deletion

include/linux/skbuff.h
include/net/addrconf.h 4 additions, 0 deletions

include/net/addrconf.h
include/net/ipip.h 10 additions, 0 deletions

include/net/ipip.h
include/net/ndisc.h 9 additions, 0 deletions

include/net/ndisc.h
net/ipv6/Kconfig 4 additions, 0 deletions

net/ipv6/Kconfig
net/ipv6/addrconf.c 25 additions, 0 deletions

net/ipv6/addrconf.c
net/ipv6/anycast.c 1 addition, 24 deletions

net/ipv6/anycast.c
net/ipv6/ndisc.c 41 additions, 1 deletion

net/ipv6/ndisc.c
net/ipv6/route.c 0 additions, 2 deletions

net/ipv6/route.c
net/ipv6/sit.c 213 additions, 44 deletions

net/ipv6/sit.c

with 330 additions and 75 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