From 6329406ff2e3c6eae78331e2bb5d4a06852e50a0 Mon Sep 17 00:00:00 2001 From: Don Skidmore Date: Tue, 27 Apr 2010 11:31:06 +0000 Subject: [PATCH] --- yaml --- r: 194555 b: refs/heads/master c: 1c4f0ef8a30d17371e18bf923775c5ed6f83bc3c h: refs/heads/master i: 194553: dafb37ef488b06f7efd4627c7de934852e83e101 194551: 882388019c65b538e5dd66cbce22c73d8f514139 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27c607618dec..9f8c476be9f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3203df043263e1bb64d8ba970eb17b0810945504 +refs/heads/master: 1c4f0ef8a30d17371e18bf923775c5ed6f83bc3c diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c index 5f8c6ab7a98a..dfbfe3520048 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c @@ -365,7 +365,7 @@ static int ixgbe_set_pauseparam(struct net_device *netdev, else fc.disable_fc_autoneg = false; - if (pause->rx_pause && pause->tx_pause) + if ((pause->rx_pause && pause->tx_pause) || pause->autoneg) fc.requested_mode = ixgbe_fc_full; else if (pause->rx_pause && !pause->tx_pause) fc.requested_mode = ixgbe_fc_rx_pause;