From f2ced1ccf463476ea3a8f4beac0427e2788ae253 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@emulex.com>
Date: Fri, 30 Dec 2011 12:15:30 +0000
Subject: [PATCH] --- yaml --- r: 279151 b: refs/heads/master c:
 94f434c2055db5fe20f10d4e0ec50ab395e1f62b h: refs/heads/master i:   279149:
 aad92435720e17c33862d45d0157755db2088cf7   279147:
 f0631f1655213a3950f9955bcc532bf2facee7ec   279143:
 2990528d0d58cc6dd1f6f5d0088b5ee82ab26f37   279135:
 ea4f70cbbbe10a3a2057ac5ee523443407fe859a v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/net/ethernet/emulex/benet/be_main.c | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index afff8cff95d3..da6080af3467 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80817cbf5ac13da76f3ee2b9259f26c09b385e84
+refs/heads/master: 94f434c2055db5fe20f10d4e0ec50ab395e1f62b
diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c
index 10f2313edbe7..fe702c1c866d 100644
--- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/trunk/drivers/net/ethernet/emulex/benet/be_main.c
@@ -978,18 +978,22 @@ static int be_set_vf_tx_rate(struct net_device *netdev,
 	if (!sriov_enabled(adapter))
 		return -EPERM;
 
-	if (vf >= adapter->num_vfs || rate < 0)
+	if (vf >= adapter->num_vfs)
 		return -EINVAL;
 
-	if (rate > 10000)
-		rate = 10000;
+	if (rate < 100 || rate > 10000) {
+		dev_err(&adapter->pdev->dev,
+			"tx rate must be between 100 and 10000 Mbps\n");
+		return -EINVAL;
+	}
 
-	adapter->vf_cfg[vf].tx_rate = rate;
 	status = be_cmd_set_qos(adapter, rate / 10, vf + 1);
 
 	if (status)
-		dev_info(&adapter->pdev->dev,
+		dev_err(&adapter->pdev->dev,
 				"tx rate %d on VF %d failed\n", rate, vf);
+	else
+		adapter->vf_cfg[vf].tx_rate = rate;
 	return status;
 }