Skip to content

Commit e433f3a

Browse files
Alexander DuyckJeff Kirsher
authored andcommitted
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: Alexander Duyck <[email protected]> Acked-by: Shannon Nelson <[email protected]> Tested-by: Andrew Bowers <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent 646bb57 commit e433f3a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -760,9 +760,9 @@ struct ixgbe_adapter {
760760
#define IXGBE_RSS_KEY_SIZE 40 /* size of RSS Hash Key in bytes */
761761
u32 *rss_key;
762762

763-
#ifdef CONFIG_XFRM
763+
#ifdef CONFIG_XFRM_OFFLOAD
764764
struct ixgbe_ipsec *ipsec;
765-
#endif /* CONFIG_XFRM */
765+
#endif /* CONFIG_XFRM_OFFLOAD */
766766
};
767767

768768
static inline u8 ixgbe_max_rss_indices(struct ixgbe_adapter *adapter)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9896,7 +9896,7 @@ ixgbe_features_check(struct sk_buff *skb, struct net_device *dev,
98969896
* the TSO, so it's the exception.
98979897
*/
98989898
if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID)) {
9899-
#ifdef CONFIG_XFRM
9899+
#ifdef CONFIG_XFRM_OFFLOAD
99009900
if (!skb->sp)
99019901
#endif
99029902
features &= ~NETIF_F_TSO;

0 commit comments

Comments
 (0)