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

Commit e433f3a5 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Use CONFIG_XFRM_OFFLOAD instead of CONFIG_XFRM 



There is no point in adding code if CONFIG_XFRM is defined that we won't
use unless CONFIG_XFRM_OFFLOAD is defined. So instead of leaving this code
floating around I am replacing the ifdef with what I believe is the correct
one so that we only include the code and variables if they will actually be
used.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Acked-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 646bb57c

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+2 −2
Original line number Diff line number Diff line
@@ -760,9 +760,9 @@ struct ixgbe_adapter { 
#define IXGBE_RSS_KEY_SIZE     40  /* size of RSS Hash Key in bytes */

	u32 *rss_key;



#ifdef CONFIG_XFRM

#ifdef CONFIG_XFRM_OFFLOAD

	struct ixgbe_ipsec *ipsec;

#endif /* CONFIG_XFRM */

#endif /* CONFIG_XFRM_OFFLOAD */

};



static inline u8 ixgbe_max_rss_indices(struct ixgbe_adapter *adapter)

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

+1 −1
Original line number Diff line number Diff line
@@ -9896,7 +9896,7 @@ ixgbe_features_check(struct sk_buff *skb, struct net_device *dev, 
	 * the TSO, so it's the exception.

	 */

	if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID)) {

#ifdef CONFIG_XFRM

#ifdef CONFIG_XFRM_OFFLOAD

		if (!skb->sp)

#endif

			features &= ~NETIF_F_TSO;