ixgbe: propagate XFRM offload state direction instead of flags

Convert the ixgbe driver to rely on XFRM offload state direction instead
of flags bits that were not checked at all.

Reviewed-by: Raed Salem <raeds@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
index 69d11ff7677d6fc78641cc025934146cb3be50b2..774de63dd93a605e7d3e82eefca8be57fd21b724 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
@@ -585,7 +585,7 @@ static int ixgbe_ipsec_add_sa(struct xfrm_state *xs)
                return -EINVAL;
        }
 
-       if (xs->xso.flags & XFRM_OFFLOAD_INBOUND) {
+       if (xs->xso.dir == XFRM_DEV_OFFLOAD_IN) {
                struct rx_sa rsa;
 
                if (xs->calg) {
@@ -757,7 +757,7 @@ static void ixgbe_ipsec_del_sa(struct xfrm_state *xs)
        u32 zerobuf[4] = {0, 0, 0, 0};
        u16 sa_idx;
 
-       if (xs->xso.flags & XFRM_OFFLOAD_INBOUND) {
+       if (xs->xso.dir == XFRM_DEV_OFFLOAD_IN) {
                struct rx_sa *rsa;
                u8 ipi;
 
@@ -903,8 +903,7 @@ int ixgbe_ipsec_vf_add_sa(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf)
        /* Tx IPsec offload doesn't seem to work on this
         * device, so block these requests for now.
         */
-       sam->flags = sam->flags & ~XFRM_OFFLOAD_IPV6;
-       if (sam->flags != XFRM_OFFLOAD_INBOUND) {
+       if (sam->dir != XFRM_DEV_OFFLOAD_IN) {
                err = -EOPNOTSUPP;
                goto err_out;
        }
@@ -915,7 +914,7 @@ int ixgbe_ipsec_vf_add_sa(struct ixgbe_adapter *adapter, u32 *msgbuf, u32 vf)
                goto err_out;
        }
 
-       xs->xso.flags = sam->flags;
+       xs->xso.dir = sam->dir;
        xs->id.spi = sam->spi;
        xs->id.proto = sam->proto;
        xs->props.family = sam->family;

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h
index d2b64ff8eb4ef715c80aa358e70388e5eb42c721..809ab51a784298292a883d13352b0a839ec14549 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h
@@ -74,7 +74,7 @@ struct ixgbe_ipsec {
 
 struct sa_mbx_msg {
        __be32 spi;
-       u8 flags;
+       u8 dir;
        u8 proto;
        u16 family;
        __be32 addr[4];

diff --git a/drivers/net/ethernet/intel/ixgbevf/ipsec.c b/drivers/net/ethernet/intel/ixgbevf/ipsec.c
index e763cee0695e803227475fc7ae5186924df69253..9984ebc62d78768339e3b34a1854088126b9f3a1 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbevf/ipsec.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ipsec.c
@@ -25,7 +25,7 @@ static int ixgbevf_ipsec_set_pf_sa(struct ixgbevf_adapter *adapter,
 
        /* send the important bits to the PF */
        sam = (struct sa_mbx_msg *)(&msgbuf[1]);
-       sam->flags = xs->xso.flags;
+       sam->dir = xs->xso.dir;
        sam->spi = xs->id.spi;
        sam->proto = xs->id.proto;
        sam->family = xs->props.family;
@@ -280,7 +280,7 @@ static int ixgbevf_ipsec_add_sa(struct xfrm_state *xs)
                return -EINVAL;
        }
 
-       if (xs->xso.flags & XFRM_OFFLOAD_INBOUND) {
+       if (xs->xso.dir == XFRM_DEV_OFFLOAD_IN) {
                struct rx_sa rsa;
 
                if (xs->calg) {
@@ -394,7 +394,7 @@ static void ixgbevf_ipsec_del_sa(struct xfrm_state *xs)
        adapter = netdev_priv(dev);
        ipsec = adapter->ipsec;
 
-       if (xs->xso.flags & XFRM_OFFLOAD_INBOUND) {
+       if (xs->xso.dir == XFRM_DEV_OFFLOAD_IN) {
                sa_idx = xs->xso.offload_handle - IXGBE_IPSEC_BASE_RX_INDEX;
 
                if (!ipsec->rx_tbl[sa_idx].used) {

diff --git a/drivers/net/ethernet/intel/ixgbevf/ipsec.h b/drivers/net/ethernet/intel/ixgbevf/ipsec.h
index 3740725041c335fdaa2ae927c095a0d21118bd06..d22990165353047ede150413f692c36d74c793be 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbevf/ipsec.h
+++ b/drivers/net/ethernet/intel/ixgbevf/ipsec.h
@@ -57,7 +57,7 @@ struct ixgbevf_ipsec {
 
 struct sa_mbx_msg {
        __be32 spi;
-       u8 flags;
+       u8 dir;
        u8 proto;
        u16 family;
        __be32 addr[4];