projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "ibmvnic: Fix releasing of sub-CRQ IRQs in interrupt context"
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
ibm
/
ibmvnic.c
diff --git
a/drivers/net/ethernet/ibm/ibmvnic.c
b/drivers/net/ethernet/ibm/ibmvnic.c
index
bfe17d9
..
213162d
100644
(file)
--- a/
drivers/net/ethernet/ibm/ibmvnic.c
+++ b/
drivers/net/ethernet/ibm/ibmvnic.c
@@
-1190,7
+1190,7
@@
static struct ibmvnic_sub_crq_queue *init_sub_crq_queue(struct ibmvnic_adapter
if (!scrq)
return NULL;
if (!scrq)
return NULL;
- scrq->msgs = (union sub_crq *)__get_free_pages(GFP_
KERNEL
, 2);
+ scrq->msgs = (union sub_crq *)__get_free_pages(GFP_
ATOMIC
, 2);
memset(scrq->msgs, 0, 4 * PAGE_SIZE);
if (!scrq->msgs) {
dev_warn(dev, "Couldn't allocate crq queue messages page\n");
memset(scrq->msgs, 0, 4 * PAGE_SIZE);
if (!scrq->msgs) {
dev_warn(dev, "Couldn't allocate crq queue messages page\n");
@@
-3654,6
+3654,7
@@
static void handle_crq_init_rsp(struct work_struct *work)
goto task_failed;
netdev->real_num_tx_queues = adapter->req_tx_queues;
goto task_failed;
netdev->real_num_tx_queues = adapter->req_tx_queues;
+ netdev->mtu = adapter->req_mtu;
if (adapter->failover) {
adapter->failover = false;
if (adapter->failover) {
adapter->failover = false;
@@
-3792,6
+3793,7
@@
static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
}
netdev->real_num_tx_queues = adapter->req_tx_queues;
}
netdev->real_num_tx_queues = adapter->req_tx_queues;
+ netdev->mtu = adapter->req_mtu;
rc = register_netdev(netdev);
if (rc) {
rc = register_netdev(netdev);
if (rc) {