Commit ebd6e96b authored by Kamal Heib's avatar Kamal Heib Committed by Jason Gunthorpe

RDMA/ipoib: Remove can_sleep parameter from iboib_mcast_alloc

can_sleep is always 0 when iboib_mcast_alloc() is called, so remove it and
use GFP_ATOMIC instead of GFP_KERNEL.

Link: https://lore.kernel.org/r/20200525130305.171509-1-kamalheib1@gmail.comSigned-off-by: default avatarKamal Heib <kamalheib1@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 49ea0c03
...@@ -135,12 +135,11 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast) ...@@ -135,12 +135,11 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)
kfree(mcast); kfree(mcast);
} }
static struct ipoib_mcast *ipoib_mcast_alloc(struct net_device *dev, static struct ipoib_mcast *ipoib_mcast_alloc(struct net_device *dev)
int can_sleep)
{ {
struct ipoib_mcast *mcast; struct ipoib_mcast *mcast;
mcast = kzalloc(sizeof(*mcast), can_sleep ? GFP_KERNEL : GFP_ATOMIC); mcast = kzalloc(sizeof(*mcast), GFP_ATOMIC);
if (!mcast) if (!mcast)
return NULL; return NULL;
...@@ -599,7 +598,7 @@ void ipoib_mcast_join_task(struct work_struct *work) ...@@ -599,7 +598,7 @@ void ipoib_mcast_join_task(struct work_struct *work)
if (!priv->broadcast) { if (!priv->broadcast) {
struct ipoib_mcast *broadcast; struct ipoib_mcast *broadcast;
broadcast = ipoib_mcast_alloc(dev, 0); broadcast = ipoib_mcast_alloc(dev);
if (!broadcast) { if (!broadcast) {
ipoib_warn(priv, "failed to allocate broadcast group\n"); ipoib_warn(priv, "failed to allocate broadcast group\n");
/* /*
...@@ -782,7 +781,7 @@ void ipoib_mcast_send(struct net_device *dev, u8 *daddr, struct sk_buff *skb) ...@@ -782,7 +781,7 @@ void ipoib_mcast_send(struct net_device *dev, u8 *daddr, struct sk_buff *skb)
ipoib_dbg_mcast(priv, "setting up send only multicast group for %pI6\n", ipoib_dbg_mcast(priv, "setting up send only multicast group for %pI6\n",
mgid); mgid);
mcast = ipoib_mcast_alloc(dev, 0); mcast = ipoib_mcast_alloc(dev);
if (!mcast) { if (!mcast) {
ipoib_warn(priv, "unable to allocate memory " ipoib_warn(priv, "unable to allocate memory "
"for multicast structure\n"); "for multicast structure\n");
...@@ -936,7 +935,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) ...@@ -936,7 +935,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
ipoib_dbg_mcast(priv, "adding multicast entry for mgid %pI6\n", ipoib_dbg_mcast(priv, "adding multicast entry for mgid %pI6\n",
mgid.raw); mgid.raw);
nmcast = ipoib_mcast_alloc(dev, 0); nmcast = ipoib_mcast_alloc(dev);
if (!nmcast) { if (!nmcast) {
ipoib_warn(priv, "unable to allocate memory for multicast structure\n"); ipoib_warn(priv, "unable to allocate memory for multicast structure\n");
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment