diff options
Diffstat (limited to 'drivers/net/ehea/ehea_main.c')
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 4538c99733fd..6ad696101418 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -92,7 +92,7 @@ static struct net_device_stats *ehea_get_stats(struct net_device *dev) | |||
92 | 92 | ||
93 | memset(stats, 0, sizeof(*stats)); | 93 | memset(stats, 0, sizeof(*stats)); |
94 | 94 | ||
95 | cb2 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 95 | cb2 = kzalloc(PAGE_SIZE, GFP_KERNEL); |
96 | if (!cb2) { | 96 | if (!cb2) { |
97 | ehea_error("no mem for cb2"); | 97 | ehea_error("no mem for cb2"); |
98 | goto out; | 98 | goto out; |
@@ -586,8 +586,8 @@ int ehea_sense_port_attr(struct ehea_port *port) | |||
586 | u64 hret; | 586 | u64 hret; |
587 | struct hcp_ehea_port_cb0 *cb0; | 587 | struct hcp_ehea_port_cb0 *cb0; |
588 | 588 | ||
589 | cb0 = kzalloc(H_CB_ALIGNMENT, GFP_ATOMIC); /* May be called via */ | 589 | cb0 = kzalloc(PAGE_SIZE, GFP_ATOMIC); /* May be called via */ |
590 | if (!cb0) { /* ehea_neq_tasklet() */ | 590 | if (!cb0) { /* ehea_neq_tasklet() */ |
591 | ehea_error("no mem for cb0"); | 591 | ehea_error("no mem for cb0"); |
592 | ret = -ENOMEM; | 592 | ret = -ENOMEM; |
593 | goto out; | 593 | goto out; |
@@ -670,7 +670,7 @@ int ehea_set_portspeed(struct ehea_port *port, u32 port_speed) | |||
670 | u64 hret; | 670 | u64 hret; |
671 | int ret = 0; | 671 | int ret = 0; |
672 | 672 | ||
673 | cb4 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 673 | cb4 = kzalloc(PAGE_SIZE, GFP_KERNEL); |
674 | if (!cb4) { | 674 | if (!cb4) { |
675 | ehea_error("no mem for cb4"); | 675 | ehea_error("no mem for cb4"); |
676 | ret = -ENOMEM; | 676 | ret = -ENOMEM; |
@@ -985,7 +985,7 @@ static int ehea_configure_port(struct ehea_port *port) | |||
985 | struct hcp_ehea_port_cb0 *cb0; | 985 | struct hcp_ehea_port_cb0 *cb0; |
986 | 986 | ||
987 | ret = -ENOMEM; | 987 | ret = -ENOMEM; |
988 | cb0 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 988 | cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL); |
989 | if (!cb0) | 989 | if (!cb0) |
990 | goto out; | 990 | goto out; |
991 | 991 | ||
@@ -1443,7 +1443,7 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa) | |||
1443 | goto out; | 1443 | goto out; |
1444 | } | 1444 | } |
1445 | 1445 | ||
1446 | cb0 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 1446 | cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL); |
1447 | if (!cb0) { | 1447 | if (!cb0) { |
1448 | ehea_error("no mem for cb0"); | 1448 | ehea_error("no mem for cb0"); |
1449 | ret = -ENOMEM; | 1449 | ret = -ENOMEM; |
@@ -1501,7 +1501,7 @@ static void ehea_promiscuous(struct net_device *dev, int enable) | |||
1501 | if ((enable && port->promisc) || (!enable && !port->promisc)) | 1501 | if ((enable && port->promisc) || (!enable && !port->promisc)) |
1502 | return; | 1502 | return; |
1503 | 1503 | ||
1504 | cb7 = kzalloc(H_CB_ALIGNMENT, GFP_ATOMIC); | 1504 | cb7 = kzalloc(PAGE_SIZE, GFP_ATOMIC); |
1505 | if (!cb7) { | 1505 | if (!cb7) { |
1506 | ehea_error("no mem for cb7"); | 1506 | ehea_error("no mem for cb7"); |
1507 | goto out; | 1507 | goto out; |
@@ -1870,7 +1870,7 @@ static void ehea_vlan_rx_register(struct net_device *dev, | |||
1870 | 1870 | ||
1871 | port->vgrp = grp; | 1871 | port->vgrp = grp; |
1872 | 1872 | ||
1873 | cb1 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 1873 | cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL); |
1874 | if (!cb1) { | 1874 | if (!cb1) { |
1875 | ehea_error("no mem for cb1"); | 1875 | ehea_error("no mem for cb1"); |
1876 | goto out; | 1876 | goto out; |
@@ -1899,7 +1899,7 @@ static void ehea_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) | |||
1899 | int index; | 1899 | int index; |
1900 | u64 hret; | 1900 | u64 hret; |
1901 | 1901 | ||
1902 | cb1 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 1902 | cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL); |
1903 | if (!cb1) { | 1903 | if (!cb1) { |
1904 | ehea_error("no mem for cb1"); | 1904 | ehea_error("no mem for cb1"); |
1905 | goto out; | 1905 | goto out; |
@@ -1935,7 +1935,7 @@ static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) | |||
1935 | if (port->vgrp) | 1935 | if (port->vgrp) |
1936 | port->vgrp->vlan_devices[vid] = NULL; | 1936 | port->vgrp->vlan_devices[vid] = NULL; |
1937 | 1937 | ||
1938 | cb1 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 1938 | cb1 = kzalloc(PAGE_SIZE, GFP_KERNEL); |
1939 | if (!cb1) { | 1939 | if (!cb1) { |
1940 | ehea_error("no mem for cb1"); | 1940 | ehea_error("no mem for cb1"); |
1941 | goto out; | 1941 | goto out; |
@@ -1968,7 +1968,7 @@ int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp) | |||
1968 | u64 dummy64 = 0; | 1968 | u64 dummy64 = 0; |
1969 | struct hcp_modify_qp_cb0* cb0; | 1969 | struct hcp_modify_qp_cb0* cb0; |
1970 | 1970 | ||
1971 | cb0 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 1971 | cb0 = kzalloc(PAGE_SIZE, GFP_KERNEL); |
1972 | if (!cb0) { | 1972 | if (!cb0) { |
1973 | ret = -ENOMEM; | 1973 | ret = -ENOMEM; |
1974 | goto out; | 1974 | goto out; |
@@ -2269,7 +2269,7 @@ int ehea_sense_adapter_attr(struct ehea_adapter *adapter) | |||
2269 | u64 hret; | 2269 | u64 hret; |
2270 | int ret; | 2270 | int ret; |
2271 | 2271 | ||
2272 | cb = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 2272 | cb = kzalloc(PAGE_SIZE, GFP_KERNEL); |
2273 | if (!cb) { | 2273 | if (!cb) { |
2274 | ret = -ENOMEM; | 2274 | ret = -ENOMEM; |
2275 | goto out; | 2275 | goto out; |
@@ -2340,7 +2340,7 @@ static int ehea_setup_single_port(struct ehea_port *port, | |||
2340 | goto out; | 2340 | goto out; |
2341 | 2341 | ||
2342 | /* Enable Jumbo frames */ | 2342 | /* Enable Jumbo frames */ |
2343 | cb4 = kzalloc(H_CB_ALIGNMENT, GFP_KERNEL); | 2343 | cb4 = kzalloc(PAGE_SIZE, GFP_KERNEL); |
2344 | if (!cb4) { | 2344 | if (!cb4) { |
2345 | ehea_error("no mem for cb4"); | 2345 | ehea_error("no mem for cb4"); |
2346 | } else { | 2346 | } else { |