aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2010-07-20 22:44:56 -0400
committerRoland Dreier <rolandd@cisco.com>2010-07-21 13:55:05 -0400
commitd3c814e8b2a094dc3bcbe6a0d93ec4824b26e86a (patch)
treed4bf0753b6694ce62f899cea90fe6f9b22118088 /drivers/infiniband
parentba6d39256bed87a0e8ee1770b5f7638bb3e0cfe4 (diff)
RDMA/cxgb4: Remove dependency on __GFP_NOFAIL
The alloc_skb() in various allocations are failable, so remove __GFP_NOFAIL from their masks. Signed-off-by: David Rientjes <rientjes@google.com> Acked-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/cxgb4/cq.c4
-rw-r--r--drivers/infiniband/hw/cxgb4/mem.c2
-rw-r--r--drivers/infiniband/hw/cxgb4/qp.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index fac5c6e68011..b3daf39eed4a 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -43,7 +43,7 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
43 int ret; 43 int ret;
44 44
45 wr_len = sizeof *res_wr + sizeof *res; 45 wr_len = sizeof *res_wr + sizeof *res;
46 skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL); 46 skb = alloc_skb(wr_len, GFP_KERNEL);
47 if (!skb) 47 if (!skb)
48 return -ENOMEM; 48 return -ENOMEM;
49 set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0); 49 set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
@@ -118,7 +118,7 @@ static int create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
118 /* build fw_ri_res_wr */ 118 /* build fw_ri_res_wr */
119 wr_len = sizeof *res_wr + sizeof *res; 119 wr_len = sizeof *res_wr + sizeof *res;
120 120
121 skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL); 121 skb = alloc_skb(wr_len, GFP_KERNEL);
122 if (!skb) { 122 if (!skb) {
123 ret = -ENOMEM; 123 ret = -ENOMEM;
124 goto err4; 124 goto err4;
diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 82b5703b8947..269373a62f22 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -59,7 +59,7 @@ static int write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len,
59 wr_len = roundup(sizeof *req + sizeof *sc + 59 wr_len = roundup(sizeof *req + sizeof *sc +
60 roundup(copy_len, T4_ULPTX_MIN_IO), 16); 60 roundup(copy_len, T4_ULPTX_MIN_IO), 16);
61 61
62 skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL); 62 skb = alloc_skb(wr_len, GFP_KERNEL);
63 if (!skb) 63 if (!skb)
64 return -ENOMEM; 64 return -ENOMEM;
65 set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0); 65 set_wr_txq(skb, CPL_PRIORITY_CONTROL, 0);
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 7065cb310553..b88b1af28c30 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -130,7 +130,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
130 /* build fw_ri_res_wr */ 130 /* build fw_ri_res_wr */
131 wr_len = sizeof *res_wr + 2 * sizeof *res; 131 wr_len = sizeof *res_wr + 2 * sizeof *res;
132 132
133 skb = alloc_skb(wr_len, GFP_KERNEL | __GFP_NOFAIL); 133 skb = alloc_skb(wr_len, GFP_KERNEL);
134 if (!skb) { 134 if (!skb) {
135 ret = -ENOMEM; 135 ret = -ENOMEM;
136 goto err7; 136 goto err7;
@@ -961,7 +961,7 @@ static int rdma_fini(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
961 PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid, 961 PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
962 qhp->ep->hwtid); 962 qhp->ep->hwtid);
963 963
964 skb = alloc_skb(sizeof *wqe, GFP_KERNEL | __GFP_NOFAIL); 964 skb = alloc_skb(sizeof *wqe, GFP_KERNEL);
965 if (!skb) 965 if (!skb)
966 return -ENOMEM; 966 return -ENOMEM;
967 set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx); 967 set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);
@@ -1035,7 +1035,7 @@ static int rdma_init(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
1035 PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid, 1035 PDBG("%s qhp %p qid 0x%x tid %u\n", __func__, qhp, qhp->wq.sq.qid,
1036 qhp->ep->hwtid); 1036 qhp->ep->hwtid);
1037 1037
1038 skb = alloc_skb(sizeof *wqe, GFP_KERNEL | __GFP_NOFAIL); 1038 skb = alloc_skb(sizeof *wqe, GFP_KERNEL);
1039 if (!skb) 1039 if (!skb)
1040 return -ENOMEM; 1040 return -ENOMEM;
1041 set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx); 1041 set_wr_txq(skb, CPL_PRIORITY_DATA, qhp->ep->txq_idx);