diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-10-24 18:57:05 +0200 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2010-10-24 18:57:05 +0200 |
| commit | 6d4121f6c20a0e86231d52f535f1c82423b3326f (patch) | |
| tree | 5c235cac699ca86b504850aa663ddadde0455a61 /net/sched/Kconfig | |
| parent | SLUB: Fix memory hotplug with !NUMA (diff) | |
| parent | Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-6d4121f6c20a0e86231d52f535f1c82423b3326f.tar.xz linux-6d4121f6c20a0e86231d52f535f1c82423b3326f.zip | |
Merge branch 'master' into for-linus
Conflicts:
include/linux/percpu.h
mm/percpu.c
Diffstat (limited to 'net/sched/Kconfig')
| -rw-r--r-- | net/sched/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 2f691fb180d1..a36270a994d7 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -518,6 +518,16 @@ config NET_ACT_SKBEDIT To compile this code as a module, choose M here: the module will be called act_skbedit. +config NET_ACT_CSUM + tristate "Checksum Updating" + depends on NET_CLS_ACT && INET + ---help--- + Say Y here to update some common checksum after some direct + packet alterations. + + To compile this code as a module, choose M here: the + module will be called act_csum. + config NET_CLS_IND bool "Incoming device classification" depends on NET_CLS_U32 || NET_CLS_FW |