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

18a41440

Commit 18a41440 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

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

parents 02829f73 4f2d7680

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/netfilter/x_tables.h 1 addition, 1 deletion

include/linux/netfilter/x_tables.h
include/net/sctp/sctp.h 2 additions, 0 deletions

include/net/sctp/sctp.h
include/net/sctp/structs.h 51 additions, 38 deletions

include/net/sctp/structs.h
net/sctp/input.c 62 additions, 13 deletions

net/sctp/input.c
net/sctp/inqueue.c 3 additions, 1 deletion

net/sctp/inqueue.c
net/sctp/proc.c 12 additions, 20 deletions

net/sctp/proc.c
net/sctp/sm_make_chunk.c 13 additions, 3 deletions

net/sctp/sm_make_chunk.c
net/sctp/sm_sideeffect.c 2 additions, 2 deletions

net/sctp/sm_sideeffect.c
net/sctp/sm_statefuns.c 2 additions, 0 deletions

net/sctp/sm_statefuns.c
net/sctp/socket.c 5 additions, 1 deletion

net/sctp/socket.c
net/sctp/sysctl.c 2 additions, 5 deletions

net/sctp/sysctl.c
net/sctp/transport.c 1 addition, 1 deletion

net/sctp/transport.c

with 156 additions and 85 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