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

Commit 85bc2663 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

ixgbe: register ipsec offload with the xfrm subsystem 



With all the support code in place we can now link in the ipsec
offload operations and set the ESP feature flag for the XFRM
subsystem to see.

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 a8a43fda

drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c

+17 −0
Original line number Diff line number Diff line
@@ -718,10 +718,23 @@ static bool ixgbe_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs) 
	return true;

}



/**

 * ixgbe_ipsec_free - called by xfrm garbage collections

 * @xs: pointer to transformer state struct

 *

 * We don't have any garbage to collect, so we shouldn't bother

 * implementing this function, but the XFRM code doesn't check for

 * existence before calling the API callback.

 **/

static void ixgbe_ipsec_free(struct xfrm_state *xs)

{

}



static const struct xfrmdev_ops ixgbe_xfrmdev_ops = {

	.xdo_dev_state_add = ixgbe_ipsec_add_sa,

	.xdo_dev_state_delete = ixgbe_ipsec_del_sa,

	.xdo_dev_offload_ok = ixgbe_ipsec_offload_ok,

	.xdo_dev_state_free = ixgbe_ipsec_free,

};



/**
@@ -895,6 +908,10 @@ void ixgbe_init_ipsec_offload(struct ixgbe_adapter *adapter) 
	ixgbe_ipsec_stop_engine(adapter);

	ixgbe_ipsec_clear_hw_tables(adapter);



	adapter->netdev->xfrmdev_ops = &ixgbe_xfrmdev_ops;

	adapter->netdev->features |= NETIF_F_HW_ESP;

	adapter->netdev->hw_enc_features |= NETIF_F_HW_ESP;



	return;



err2:

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+6 −0
Original line number Diff line number Diff line
@@ -9895,6 +9895,12 @@ ixgbe_features_check(struct sk_buff *skb, struct net_device *dev, 
	if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID))

		features &= ~NETIF_F_TSO;



#ifdef CONFIG_XFRM_OFFLOAD

	/* IPsec offload doesn't get along well with others *yet* */

	if (skb->sp)

		features &= ~(NETIF_F_TSO | NETIF_F_HW_CSUM);

#endif



	return features;

}