diff options
| author |   Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-06-10 21:40:04 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-06-11 12:22:26 -0700 |
| commit | d7053e0433c2f6a53c049548500f6037c955b2c9 (patch) | |
| tree | f95a4f2bcc643a6fbd791fa9081cec04e99f5a43 | |
| parent | nfp: tls: set skb decrypted flag (diff) | |
| download | linux-dev-d7053e0433c2f6a53c049548500f6037c955b2c9.tar.xz linux-dev-d7053e0433c2f6a53c049548500f6037c955b2c9.zip | |
nfp: rename nfp_ccm_mbox_alloc()
We need the name nfp_ccm_mbox_alloc() for allocating the mailbox
communication channel itself.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/ccm.h | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/ccm_mbox.c | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/crypto/tls.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/ccm.h b/drivers/net/ethernet/netronome/nfp/ccm.h index 01efa779ab31..c905898ab26e 100644 --- a/drivers/net/ethernet/netronome/nfp/ccm.h +++ b/drivers/net/ethernet/netronome/nfp/ccm.h @@ -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); struct sk_buff * -nfp_ccm_mbox_alloc(struct nfp_net *nn, unsigned int req_size, - unsigned int reply_size, gfp_t flags); +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, unsigned int reply_size, diff --git a/drivers/net/ethernet/netronome/nfp/ccm_mbox.c b/drivers/net/ethernet/netronome/nfp/ccm_mbox.c index e5acd96c3335..53995d53aa3f 100644 --- a/drivers/net/ethernet/netronome/nfp/ccm_mbox.c +++ b/drivers/net/ethernet/netronome/nfp/ccm_mbox.c @@ -564,8 +564,8 @@ err_free_skb: } struct sk_buff * -nfp_ccm_mbox_alloc(struct nfp_net *nn, unsigned int req_size, - unsigned int reply_size, gfp_t flags) +nfp_ccm_mbox_msg_alloc(struct nfp_net *nn, unsigned int req_size, + unsigned int reply_size, gfp_t flags) { unsigned int max_size; struct sk_buff *skb; diff --git a/drivers/net/ethernet/netronome/nfp/crypto/tls.c b/drivers/net/ethernet/netronome/nfp/crypto/tls.c index c638223e9f60..b7d7317d71d1 100644 --- a/drivers/net/ethernet/netronome/nfp/crypto/tls.c +++ b/drivers/net/ethernet/netronome/nfp/crypto/tls.c @@ -94,9 +94,9 @@ 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, - sizeof(struct nfp_crypto_reply_simple), - flags); + return nfp_ccm_mbox_msg_alloc(nn, req_sz, + sizeof(struct nfp_crypto_reply_simple), + flags); } static int @@ -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; |