net: flow_offload: rename TCF_BLOCK_BINDER_TYPE_* to FLOW_BLOCK_BINDER_TYPE_*
Rename from TCF_BLOCK_BINDER_TYPE_* to FLOW_BLOCK_BINDER_TYPE_* and remove temporary tcf_block_binder_type alias. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
9c0e189ec9
commit
32f8c4093a
@@ -679,7 +679,7 @@ static void tc_indr_block_ing_cmd(struct tc_indr_block_dev *indr_dev,
|
||||
{
|
||||
struct tc_block_offload bo = {
|
||||
.command = command,
|
||||
.binder_type = TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS,
|
||||
.binder_type = FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS,
|
||||
.block = indr_dev->block,
|
||||
};
|
||||
|
||||
@@ -1341,17 +1341,17 @@ static void tcf_block_release(struct Qdisc *q, struct tcf_block *block,
|
||||
struct tcf_block_owner_item {
|
||||
struct list_head list;
|
||||
struct Qdisc *q;
|
||||
enum tcf_block_binder_type binder_type;
|
||||
enum flow_block_binder_type binder_type;
|
||||
};
|
||||
|
||||
static void
|
||||
tcf_block_owner_netif_keep_dst(struct tcf_block *block,
|
||||
struct Qdisc *q,
|
||||
enum tcf_block_binder_type binder_type)
|
||||
enum flow_block_binder_type binder_type)
|
||||
{
|
||||
if (block->keep_dst &&
|
||||
binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_INGRESS &&
|
||||
binder_type != TCF_BLOCK_BINDER_TYPE_CLSACT_EGRESS)
|
||||
binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS &&
|
||||
binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)
|
||||
netif_keep_dst(qdisc_dev(q));
|
||||
}
|
||||
|
||||
@@ -1368,7 +1368,7 @@ EXPORT_SYMBOL(tcf_block_netif_keep_dst);
|
||||
|
||||
static int tcf_block_owner_add(struct tcf_block *block,
|
||||
struct Qdisc *q,
|
||||
enum tcf_block_binder_type binder_type)
|
||||
enum flow_block_binder_type binder_type)
|
||||
{
|
||||
struct tcf_block_owner_item *item;
|
||||
|
||||
@@ -1383,7 +1383,7 @@ static int tcf_block_owner_add(struct tcf_block *block,
|
||||
|
||||
static void tcf_block_owner_del(struct tcf_block *block,
|
||||
struct Qdisc *q,
|
||||
enum tcf_block_binder_type binder_type)
|
||||
enum flow_block_binder_type binder_type)
|
||||
{
|
||||
struct tcf_block_owner_item *item;
|
||||
|
||||
|
Reference in New Issue
Block a user