Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / drivers / net / ethernet / amd / xgbe / xgbe-drv.c

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
index a713abd9d03e63aea8aab96c4f5569d1d6b3e44d..54593e03d821e8e2764dc57047392d090cd3fd4d 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -1854,7 +1854,8 @@ static int xgbe_setup_tc(struct net_device *netdev, u32 handle, __be16 proto,
        if (tc_to_netdev->type != TC_SETUP_MQPRIO)
                return -EINVAL;
 
-       tc = tc_to_netdev->tc;
+       tc_to_netdev->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
+       tc = tc_to_netdev->mqprio->num_tc;
 
        if (tc > pdata->hw_feat.tc_cnt)
                return -EINVAL;