> -----Original Message----- > From: Intel-wired-lan [mailto:[email protected]] On > Behalf Of John Fastabend > Sent: Monday, February 29, 2016 11:26 AM > To: [email protected]; [email protected]; Kirsher, > Jeffrey T > Cc: [email protected] > Subject: [Intel-wired-lan] [net-next PATCH] net: relax setup_tc ndo op > handle restriction > > I added this check in setup_tc to multiple drivers, > > if (handle != TC_H_ROOT || tc->type != TC_SETUP_MQPRIO) > > Unfortunately restricting to TC_H_ROOT like this breaks the old > instantiation of mqprio to setup a hardware qdisc. This patch > relaxes the test to only check the type to make it equivalent > to the check before I broke it. With this the old instantiation > continues to work. > > A good smoke test is to setup mqprio with, > > # tc qdisc add dev eth4 root mqprio num_tc 8 \ > map 0 1 2 3 4 5 6 7 \ > queues 0@0 1@1 2@2 3@3 4@4 5@5 6@6 7@7 > > Fixes: e4c6734eaab9 ("net: rework ndo tc op to consume additional qdisc > handle paramete") > Reported-by: Singh Krishneil <[email protected]> > Reported-by: Jake Keller <[email protected]> > CC: Murali Karicheri <[email protected]> > CC: Shradha Shah <[email protected]> > CC: Or Gerlitz <[email protected]> > CC: Ariel Elior <[email protected]> > CC: Jeff Kirsher <[email protected]> > CC: Bruce Allan <[email protected]> > CC: Jesse Brandeburg <[email protected]> > CC: Don Skidmore <[email protected]> > Signed-off-by: John Fastabend <[email protected]> > --- > drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- > drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- > drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- > drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- > drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- > drivers/net/ethernet/sfc/tx.c | 2 +- > drivers/net/ethernet/ti/netcp_core.c | 2 +- > 8 files changed, 8 insertions(+), 8 deletions(-)
Jeff, please apply this to your next-queue tree/dev-queue branch ASAP as it is blocking the testing of another patch already in that queue. Thanks, Bruce.
