diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 13:32:45 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-04-01 13:32:45 +0200 |
| commit | 4c805fb704fc7890ec6615b286f09aeb5e2603d4 (patch) | |
| tree | 24f79be444c9dd3df7116037fd3bd3e17b01ebd3 /drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | |
| parent | f454d9a378a1ccb676adfa6e2449ef17e66696b5 (diff) | |
| parent | 77a36a3ab4ff17fad23831192e3694a3c5a1750d (diff) | |
| download | linux-4c805fb704fc7890ec6615b286f09aeb5e2603d4.tar.gz | |
Merge branch 'for-5.7/glorious' into for-linus
- report descriptor fix for Glorious PC Gaming Race device from Samuel Čavoj
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns3/hns3_enet.c')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index acb796cc10d0..a7f40aa1a0ea 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -1711,7 +1711,7 @@ static int hns3_setup_tc(struct net_device *netdev, void *type_data) netif_dbg(h, drv, netdev, "setup tc: num_tc=%u\n", tc); return (kinfo->dcb_ops && kinfo->dcb_ops->setup_tc) ? - kinfo->dcb_ops->setup_tc(h, tc, prio_tc) : -EOPNOTSUPP; + kinfo->dcb_ops->setup_tc(h, tc ? tc : 1, prio_tc) : -EOPNOTSUPP; } static int hns3_nic_setup_tc(struct net_device *dev, enum tc_setup_type type, |