File tree Expand file tree Collapse file tree 3 files changed +13
-7
lines changed Expand file tree Collapse file tree 3 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -1004,13 +1004,16 @@ struct ethtool_ops {
1004
1004
struct netlink_ext_ack * extack );
1005
1005
int (* create_rxfh_context )(struct net_device * ,
1006
1006
struct ethtool_rxfh_context * ctx ,
1007
- const struct ethtool_rxfh_param * rxfh );
1007
+ const struct ethtool_rxfh_param * rxfh ,
1008
+ struct netlink_ext_ack * extack );
1008
1009
int (* modify_rxfh_context )(struct net_device * ,
1009
1010
struct ethtool_rxfh_context * ctx ,
1010
- const struct ethtool_rxfh_param * rxfh );
1011
+ const struct ethtool_rxfh_param * rxfh ,
1012
+ struct netlink_ext_ack * extack );
1011
1013
int (* remove_rxfh_context )(struct net_device * ,
1012
1014
struct ethtool_rxfh_context * ctx ,
1013
- u32 rss_context );
1015
+ u32 rss_context ,
1016
+ struct netlink_ext_ack * extack );
1014
1017
void (* get_channels )(struct net_device * , struct ethtool_channels * );
1015
1018
int (* set_channels )(struct net_device * , struct ethtool_channels * );
1016
1019
int (* get_dump_flag )(struct net_device * , struct ethtool_dump * );
Original file line number Diff line number Diff line change @@ -11256,7 +11256,7 @@ static void netdev_rss_contexts_free(struct net_device *dev)
11256
11256
xa_erase (& dev -> ethtool -> rss_ctx , context );
11257
11257
if (dev -> ethtool_ops -> create_rxfh_context )
11258
11258
dev -> ethtool_ops -> remove_rxfh_context (dev , ctx ,
11259
- context );
11259
+ context , NULL );
11260
11260
else
11261
11261
dev -> ethtool_ops -> set_rxfh (dev , & rxfh , NULL );
11262
11262
kfree (ctx );
Original file line number Diff line number Diff line change @@ -1426,12 +1426,15 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
1426
1426
1427
1427
if (rxfh .rss_context && ops -> create_rxfh_context ) {
1428
1428
if (create )
1429
- ret = ops -> create_rxfh_context (dev , ctx , & rxfh_dev );
1429
+ ret = ops -> create_rxfh_context (dev , ctx , & rxfh_dev ,
1430
+ extack );
1430
1431
else if (rxfh_dev .rss_delete )
1431
1432
ret = ops -> remove_rxfh_context (dev , ctx ,
1432
- rxfh .rss_context );
1433
+ rxfh .rss_context ,
1434
+ extack );
1433
1435
else
1434
- ret = ops -> modify_rxfh_context (dev , ctx , & rxfh_dev );
1436
+ ret = ops -> modify_rxfh_context (dev , ctx , & rxfh_dev ,
1437
+ extack );
1435
1438
} else {
1436
1439
ret = ops -> set_rxfh (dev , & rxfh_dev , extack );
1437
1440
}
You can’t perform that action at this time.
0 commit comments