From f906e456ca4b4748fc4006f5ed991989eed19892 Mon Sep 17 00:00:00 2001
From: Brian King <brking@linux.vnet.ibm.com>
Date: Fri, 3 Aug 2007 13:55:19 +1000
Subject: [PATCH] --- yaml --- r: 63729 b: refs/heads/master c:
 76b9cfccb39f542ce48a79b9ad50af25e422506c h: refs/heads/master i:   63727:
 2d6b288d3fe23039325f287b52a851c72e9da76c v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/net/ibmveth.c | 24 ++++++++++++++----------
 trunk/drivers/net/ibmveth.h |  3 ---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 78c22f17e1cb..bee0d8ad6a39 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c21723edd5f6c288ab613ed658b7140e07fc7209
+refs/heads/master: 76b9cfccb39f542ce48a79b9ad50af25e422506c
diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c
index d96eb7229548..cf4a92436aa8 100644
--- a/trunk/drivers/net/ibmveth.c
+++ b/trunk/drivers/net/ibmveth.c
@@ -1280,24 +1280,28 @@ const char * buf, size_t count)
 			int i;
 			/* Make sure there is a buffer pool with buffers that
 			   can hold a packet of the size of the MTU */
-			for(i = 0; i<IbmVethNumBufferPools; i++) {
+			for (i = 0; i < IbmVethNumBufferPools; i++) {
 				if (pool == &adapter->rx_buff_pool[i])
 					continue;
 				if (!adapter->rx_buff_pool[i].active)
 					continue;
-				if (mtu < adapter->rx_buff_pool[i].buff_size) {
-					pool->active = 0;
-					h_free_logical_lan_buffer(adapter->
-								  vdev->
-								  unit_address,
-								  pool->
-								  buff_size);
-				}
+				if (mtu <= adapter->rx_buff_pool[i].buff_size)
+					break;
 			}
-			if (pool->active) {
+
+			if (i == IbmVethNumBufferPools) {
 				ibmveth_error_printk("no active pool >= MTU\n");
 				return -EPERM;
 			}
+
+			pool->active = 0;
+			if (netif_running(netdev)) {
+				adapter->pool_config = 1;
+				ibmveth_close(netdev);
+				adapter->pool_config = 0;
+				if ((rc = ibmveth_open(netdev)))
+					return rc;
+			}
 		}
 	} else if (attr == &veth_num_attr) {
 		if (value <= 0 || value > IBMVETH_MAX_POOL_COUNT)
diff --git a/trunk/drivers/net/ibmveth.h b/trunk/drivers/net/ibmveth.h
index bb69ccae8ace..72cc15a6cab7 100644
--- a/trunk/drivers/net/ibmveth.h
+++ b/trunk/drivers/net/ibmveth.h
@@ -73,9 +73,6 @@ static inline long h_send_logical_lan(unsigned long unit_address,
 #define h_change_logical_lan_mac(ua, mac) \
   plpar_hcall_norets(H_CHANGE_LOGICAL_LAN_MAC, ua, mac)
 
-#define h_free_logical_lan_buffer(ua, bufsize) \
-  plpar_hcall_norets(H_FREE_LOGICAL_LAN_BUFFER, ua, bufsize)
-
 #define IbmVethNumBufferPools 5
 #define IBMVETH_BUFF_OH 22 /* Overhead: 14 ethernet header + 8 opaque handle */
 #define IBMVETH_MAX_MTU 68