mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
b1109bf085
27 changed files with 165 additions and 143 deletions
|
|
@ -433,7 +433,7 @@ config NET_ACT_POLICE
|
|||
module.
|
||||
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called police.
|
||||
module will be called act_police.
|
||||
|
||||
config NET_ACT_GACT
|
||||
tristate "Generic actions"
|
||||
|
|
@ -443,7 +443,7 @@ config NET_ACT_GACT
|
|||
accepting packets.
|
||||
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called gact.
|
||||
module will be called act_gact.
|
||||
|
||||
config GACT_PROB
|
||||
bool "Probability support"
|
||||
|
|
@ -459,7 +459,7 @@ config NET_ACT_MIRRED
|
|||
other devices.
|
||||
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called mirred.
|
||||
module will be called act_mirred.
|
||||
|
||||
config NET_ACT_IPT
|
||||
tristate "IPtables targets"
|
||||
|
|
@ -469,7 +469,7 @@ config NET_ACT_IPT
|
|||
classification.
|
||||
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called ipt.
|
||||
module will be called act_ipt.
|
||||
|
||||
config NET_ACT_NAT
|
||||
tristate "Stateless NAT"
|
||||
|
|
@ -479,7 +479,7 @@ config NET_ACT_NAT
|
|||
netfilter for NAT unless you know what you are doing.
|
||||
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called nat.
|
||||
module will be called act_nat.
|
||||
|
||||
config NET_ACT_PEDIT
|
||||
tristate "Packet Editing"
|
||||
|
|
@ -488,7 +488,7 @@ config NET_ACT_PEDIT
|
|||
Say Y here if you want to mangle the content of packets.
|
||||
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called pedit.
|
||||
module will be called act_pedit.
|
||||
|
||||
config NET_ACT_SIMP
|
||||
tristate "Simple Example (Debug)"
|
||||
|
|
@ -502,7 +502,7 @@ config NET_ACT_SIMP
|
|||
If unsure, say N.
|
||||
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called simple.
|
||||
module will be called act_simple.
|
||||
|
||||
config NET_ACT_SKBEDIT
|
||||
tristate "SKB Editing"
|
||||
|
|
@ -513,7 +513,7 @@ config NET_ACT_SKBEDIT
|
|||
If unsure, say N.
|
||||
|
||||
To compile this code as a module, choose M here: the
|
||||
module will be called skbedit.
|
||||
module will be called act_skbedit.
|
||||
|
||||
config NET_CLS_IND
|
||||
bool "Incoming device classification"
|
||||
|
|
|
|||
Loading…
Reference in a new issue