1 files changed, 15 insertions, 12 deletions

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index d96eb7229548..acba90f1638e 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -963,7 +963,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
 {
         int rc, i;
         struct net_device *netdev;
-        struct ibmveth_adapter *adapter = NULL;
+        struct ibmveth_adapter *adapter;
 
         unsigned char *mac_addr_p;
         unsigned int *mcastFilterSize_p;
@@ -997,7 +997,6 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
         SET_MODULE_OWNER(netdev);
 
         adapter = netdev->priv;
-        memset(adapter, 0, sizeof(adapter));
         dev->dev.driver_data = netdev;
 
         adapter->vdev = dev;
@@ -1280,24 +1279,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)