David S. Miller 3c709f8fb4 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6 ...

Conflicts:
	drivers/net/benet/be_main.c

2011-05-11 14:26:58 -04:00

..

Kconfig

ipsec: ipcomp - Merge IPComp implementations

2008-07-25 02:54:40 -07:00

Makefile

xfrm: Move IPsec replay detection functions to a separate file

2011-03-13 20:22:30 -07:00

xfrm_algo.c

xfrm: Pass name as const to xfrm_*_get_byname().

2011-02-27 23:04:45 -08:00

xfrm_hash.c

net: allow GFP_HIGHMEM in __vmalloc()

2010-11-21 10:04:04 -08:00

xfrm_hash.h

xfrm: Const'ify address args to hash helpers.

2011-02-23 23:07:42 -08:00

xfrm_input.c

xfrm: Move the test on replay window size into the replay check functions

2011-03-28 23:34:51 -07:00

xfrm_ipcomp.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

xfrm_output.c

dst: Clone child entry in skb_dst_pop

2011-03-27 17:55:01 -07:00

xfrm_policy.c

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

2011-05-11 14:26:58 -04:00

xfrm_proc.c

xfrm: Introduce LINUX_MIB_XFRMFWDHDRERROR

2010-02-18 15:43:09 -08:00

xfrm_replay.c

xfrm: Don't allow esn with disabled anti replay detection

2011-05-10 15:03:34 -07:00

xfrm_state.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

xfrm_sysctl.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

xfrm_user.c

xfrm: Check for the new replay implementation if an esn state is inserted

2011-04-26 12:46:04 -07:00