diff --git a/[refs] b/[refs] index 8434245eab4c..bf930ce0c1fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2684b516020c162b2852a2171ec588713c6cec0 +refs/heads/master: 003212cc599cdc006de486e28c1f6b327bcb9808 diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c index 574f4d472551..5c7eb06e5bc7 100644 --- a/trunk/drivers/net/ibmveth.c +++ b/trunk/drivers/net/ibmveth.c @@ -251,7 +251,7 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc for(i = 0; i < count; ++i) { union ibmveth_buf_desc desc; - skb = alloc_skb(pool->buff_size, GFP_ATOMIC); + skb = netdev_alloc_skb(adapter->netdev, pool->buff_size); if(!skb) { ibmveth_debug_printk("replenish: unable to allocate skb\n");