Commit d7053e04 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

nfp: rename nfp_ccm_mbox_alloc()

We need the name nfp_ccm_mbox_alloc() for allocating the mailbox
communication channel itself.
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5bcb5c7e
...@@ -112,8 +112,8 @@ nfp_ccm_communicate(struct nfp_ccm *ccm, struct sk_buff *skb, ...@@ -112,8 +112,8 @@ nfp_ccm_communicate(struct nfp_ccm *ccm, struct sk_buff *skb,
bool nfp_ccm_mbox_fits(struct nfp_net *nn, unsigned int size); bool nfp_ccm_mbox_fits(struct nfp_net *nn, unsigned int size);
struct sk_buff * struct sk_buff *
nfp_ccm_mbox_alloc(struct nfp_net *nn, unsigned int req_size, nfp_ccm_mbox_msg_alloc(struct nfp_net *nn, unsigned int req_size,
unsigned int reply_size, gfp_t flags); unsigned int reply_size, gfp_t flags);
int nfp_ccm_mbox_communicate(struct nfp_net *nn, struct sk_buff *skb, int nfp_ccm_mbox_communicate(struct nfp_net *nn, struct sk_buff *skb,
enum nfp_ccm_type type, enum nfp_ccm_type type,
unsigned int reply_size, unsigned int reply_size,
......
...@@ -564,8 +564,8 @@ int nfp_ccm_mbox_communicate(struct nfp_net *nn, struct sk_buff *skb, ...@@ -564,8 +564,8 @@ int nfp_ccm_mbox_communicate(struct nfp_net *nn, struct sk_buff *skb,
} }
struct sk_buff * struct sk_buff *
nfp_ccm_mbox_alloc(struct nfp_net *nn, unsigned int req_size, nfp_ccm_mbox_msg_alloc(struct nfp_net *nn, unsigned int req_size,
unsigned int reply_size, gfp_t flags) unsigned int reply_size, gfp_t flags)
{ {
unsigned int max_size; unsigned int max_size;
struct sk_buff *skb; struct sk_buff *skb;
......
...@@ -94,9 +94,9 @@ nfp_net_tls_conn_remove(struct nfp_net *nn, enum tls_offload_ctx_dir direction) ...@@ -94,9 +94,9 @@ nfp_net_tls_conn_remove(struct nfp_net *nn, enum tls_offload_ctx_dir direction)
static struct sk_buff * static struct sk_buff *
nfp_net_tls_alloc_simple(struct nfp_net *nn, size_t req_sz, gfp_t flags) nfp_net_tls_alloc_simple(struct nfp_net *nn, size_t req_sz, gfp_t flags)
{ {
return nfp_ccm_mbox_alloc(nn, req_sz, return nfp_ccm_mbox_msg_alloc(nn, req_sz,
sizeof(struct nfp_crypto_reply_simple), sizeof(struct nfp_crypto_reply_simple),
flags); flags);
} }
static int static int
...@@ -283,7 +283,7 @@ nfp_net_tls_add(struct net_device *netdev, struct sock *sk, ...@@ -283,7 +283,7 @@ nfp_net_tls_add(struct net_device *netdev, struct sock *sk,
if (err) if (err)
return err; return err;
skb = nfp_ccm_mbox_alloc(nn, req_sz, sizeof(*reply), GFP_KERNEL); skb = nfp_ccm_mbox_msg_alloc(nn, req_sz, sizeof(*reply), GFP_KERNEL);
if (!skb) { if (!skb) {
err = -ENOMEM; err = -ENOMEM;
goto err_conn_remove; goto err_conn_remove;
......
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