Commit 99a7b0c1 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher

ixgbe: prep IPsec constants for later use

Pull out a couple of values from a function so they can be used
later elsewhere.
Signed-off-by: default avatarShannon Nelson <shannon.nelson@oracle.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b2875fbf
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
#include <net/xfrm.h> #include <net/xfrm.h>
#include <crypto/aead.h> #include <crypto/aead.h>
#define IXGBE_IPSEC_KEY_BITS 160
static const char aes_gcm_name[] = "rfc4106(gcm(aes))";
/** /**
* ixgbe_ipsec_set_tx_sa - set the Tx SA registers * ixgbe_ipsec_set_tx_sa - set the Tx SA registers
* @hw: hw specific details * @hw: hw specific details
...@@ -407,7 +410,6 @@ static int ixgbe_ipsec_parse_proto_keys(struct xfrm_state *xs, ...@@ -407,7 +410,6 @@ static int ixgbe_ipsec_parse_proto_keys(struct xfrm_state *xs,
struct net_device *dev = xs->xso.dev; struct net_device *dev = xs->xso.dev;
unsigned char *key_data; unsigned char *key_data;
char *alg_name = NULL; char *alg_name = NULL;
const char aes_gcm_name[] = "rfc4106(gcm(aes))";
int key_len; int key_len;
if (!xs->aead) { if (!xs->aead) {
...@@ -435,9 +437,9 @@ static int ixgbe_ipsec_parse_proto_keys(struct xfrm_state *xs, ...@@ -435,9 +437,9 @@ static int ixgbe_ipsec_parse_proto_keys(struct xfrm_state *xs,
* we don't need to do any byteswapping. * we don't need to do any byteswapping.
* 160 accounts for 16 byte key and 4 byte salt * 160 accounts for 16 byte key and 4 byte salt
*/ */
if (key_len == 160) { if (key_len == IXGBE_IPSEC_KEY_BITS) {
*mysalt = ((u32 *)key_data)[4]; *mysalt = ((u32 *)key_data)[4];
} else if (key_len != 128) { } else if (key_len != (IXGBE_IPSEC_KEY_BITS - (sizeof(*mysalt) * 8))) {
netdev_err(dev, "IPsec hw offload only supports keys up to 128 bits with a 32 bit salt\n"); netdev_err(dev, "IPsec hw offload only supports keys up to 128 bits with a 32 bit salt\n");
return -EINVAL; return -EINVAL;
} else { } else {
......
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