diff options
Diffstat (limited to 'net/dsa/slave.c')
-rw-r--r-- | net/dsa/slave.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 614c38ece104..33f41178afcc 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c | |||
@@ -951,7 +951,7 @@ static int dsa_slave_setup_tc_block(struct net_device *dev, | |||
951 | struct flow_block_offload *f) | 951 | struct flow_block_offload *f) |
952 | { | 952 | { |
953 | struct flow_block_cb *block_cb; | 953 | struct flow_block_cb *block_cb; |
954 | tc_setup_cb_t *cb; | 954 | flow_setup_cb_t *cb; |
955 | 955 | ||
956 | if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) | 956 | if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) |
957 | cb = dsa_slave_setup_tc_block_cb_ig; | 957 | cb = dsa_slave_setup_tc_block_cb_ig; |
@@ -967,7 +967,7 @@ static int dsa_slave_setup_tc_block(struct net_device *dev, | |||
967 | if (flow_block_cb_is_busy(cb, dev, &dsa_slave_block_cb_list)) | 967 | if (flow_block_cb_is_busy(cb, dev, &dsa_slave_block_cb_list)) |
968 | return -EBUSY; | 968 | return -EBUSY; |
969 | 969 | ||
970 | block_cb = flow_block_cb_alloc(f->net, cb, dev, dev, NULL); | 970 | block_cb = flow_block_cb_alloc(cb, dev, dev, NULL); |
971 | if (IS_ERR(block_cb)) | 971 | if (IS_ERR(block_cb)) |
972 | return PTR_ERR(block_cb); | 972 | return PTR_ERR(block_cb); |
973 | 973 | ||
@@ -975,7 +975,7 @@ static int dsa_slave_setup_tc_block(struct net_device *dev, | |||
975 | list_add_tail(&block_cb->driver_list, &dsa_slave_block_cb_list); | 975 | list_add_tail(&block_cb->driver_list, &dsa_slave_block_cb_list); |
976 | return 0; | 976 | return 0; |
977 | case FLOW_BLOCK_UNBIND: | 977 | case FLOW_BLOCK_UNBIND: |
978 | block_cb = flow_block_cb_lookup(f, cb, dev); | 978 | block_cb = flow_block_cb_lookup(f->block, cb, dev); |
979 | if (!block_cb) | 979 | if (!block_cb) |
980 | return -ENOENT; | 980 | return -ENOENT; |
981 | 981 | ||