diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-26 01:07:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-26 01:07:17 +0200 |
| commit | 9ff3b40e411c00870d1c29cd6b843fca7c4160ae (patch) | |
| tree | 4d58943bf8907f5704ba004fd5383c0d7683c61f /drivers/net/ethernet/chelsio/cxgb4 | |
| parent | Merge branch 'r8169-improve-PHY-initialization-and-WoL-handling' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.tar.xz linux-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index dd04a2f89ce6..bc03c175a3cd 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -263,7 +263,7 @@ static void dcb_tx_queue_prio_enable(struct net_device *dev, int enable) "Can't %s DCB Priority on port %d, TX Queue %d: err=%d\n", enable ? "set" : "unset", pi->port_id, i, -err); else - txq->dcb_prio = value; + txq->dcb_prio = enable ? value : 0; } } |