Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/netronome/nfp/ccm.h

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ nfp_ccm_communicate(struct nfp_ccm *ccm, struct sk_buff *skb, 


bool nfp_ccm_mbox_fits(struct nfp_net *nn, unsigned int size);

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);

int nfp_ccm_mbox_communicate(struct nfp_net *nn, struct sk_buff *skb,

			     enum nfp_ccm_type type,

drivers/net/ethernet/netronome/nfp/ccm_mbox.c

+2 −2
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ int nfp_ccm_mbox_communicate(struct nfp_net *nn, struct sk_buff *skb, 
}



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 max_size;

drivers/net/ethernet/netronome/nfp/crypto/tls.c

+4 −4
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ nfp_net_tls_conn_remove(struct nfp_net *nn, enum tls_offload_ctx_dir direction) 
static struct sk_buff *

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),

				      flags);

}
@@ -283,7 +283,7 @@ nfp_net_tls_add(struct net_device *netdev, struct sock *sk, 
	if (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) {

		err = -ENOMEM;

		goto err_conn_remove;