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

Browse source

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [AF_RXRPC]: Return the number of bytes buffered in rxrpc_send_data()
  [IPVS]: Fix state variable on failure to start ipvs threads
  [XFRM]: Fix MTU calculation for non-ESP SAs

...

This commit is contained in:

Linus Torvalds 2007-06-22 11:10:05 -07:00

parent 0864a4e201 19e6454ca7

commit e2f90a9141

3 changed files with 44 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

41

net/ipv4/ipvs/ip_vs_sync.c

View file

5

net/rxrpc/ar-output.c

View file

2

net/xfrm/xfrm_state.c

View file