|
@@ -915,17 +915,36 @@ static int ibmveth_change_mtu(struct net_device *dev, int new_mtu)
|
|
{
|
|
{
|
|
struct ibmveth_adapter *adapter = dev->priv;
|
|
struct ibmveth_adapter *adapter = dev->priv;
|
|
int new_mtu_oh = new_mtu + IBMVETH_BUFF_OH;
|
|
int new_mtu_oh = new_mtu + IBMVETH_BUFF_OH;
|
|
- int i;
|
|
|
|
|
|
+ int reinit = 0;
|
|
|
|
+ int i, rc;
|
|
|
|
|
|
if (new_mtu < IBMVETH_MAX_MTU)
|
|
if (new_mtu < IBMVETH_MAX_MTU)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
+ for (i = 0; i < IbmVethNumBufferPools; i++)
|
|
|
|
+ if (new_mtu_oh < adapter->rx_buff_pool[i].buff_size)
|
|
|
|
+ break;
|
|
|
|
+
|
|
|
|
+ if (i == IbmVethNumBufferPools)
|
|
|
|
+ return -EINVAL;
|
|
|
|
+
|
|
/* Look for an active buffer pool that can hold the new MTU */
|
|
/* Look for an active buffer pool that can hold the new MTU */
|
|
for(i = 0; i<IbmVethNumBufferPools; i++) {
|
|
for(i = 0; i<IbmVethNumBufferPools; i++) {
|
|
- if (!adapter->rx_buff_pool[i].active)
|
|
|
|
- continue;
|
|
|
|
|
|
+ if (!adapter->rx_buff_pool[i].active) {
|
|
|
|
+ adapter->rx_buff_pool[i].active = 1;
|
|
|
|
+ reinit = 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (new_mtu_oh < adapter->rx_buff_pool[i].buff_size) {
|
|
if (new_mtu_oh < adapter->rx_buff_pool[i].buff_size) {
|
|
- dev->mtu = new_mtu;
|
|
|
|
|
|
+ if (reinit && netif_running(adapter->netdev)) {
|
|
|
|
+ adapter->pool_config = 1;
|
|
|
|
+ ibmveth_close(adapter->netdev);
|
|
|
|
+ adapter->pool_config = 0;
|
|
|
|
+ dev->mtu = new_mtu;
|
|
|
|
+ if ((rc = ibmveth_open(adapter->netdev)))
|
|
|
|
+ return rc;
|
|
|
|
+ } else
|
|
|
|
+ dev->mtu = new_mtu;
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
}
|
|
}
|