浏览代码

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 <alexander.h.duyck@intel.com>
Acked-by: Shannon Nelson <shannon.nelson@oracle.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Alexander Duyck 7 年之前
父节点
当前提交
e433f3a5e2
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      drivers/net/ethernet/intel/ixgbe/ixgbe.h
  2. 1 1
      drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+ 2 - 2
drivers/net/ethernet/intel/ixgbe/ixgbe.h

@@ -760,9 +760,9 @@ struct ixgbe_adapter {
 #define IXGBE_RSS_KEY_SIZE     40  /* size of RSS Hash Key in bytes */
 #define IXGBE_RSS_KEY_SIZE     40  /* size of RSS Hash Key in bytes */
 	u32 *rss_key;
 	u32 *rss_key;
 
 
-#ifdef CONFIG_XFRM
+#ifdef CONFIG_XFRM_OFFLOAD
 	struct ixgbe_ipsec *ipsec;
 	struct ixgbe_ipsec *ipsec;
-#endif /* CONFIG_XFRM */
+#endif /* CONFIG_XFRM_OFFLOAD */
 };
 };
 
 
 static inline u8 ixgbe_max_rss_indices(struct ixgbe_adapter *adapter)
 static inline u8 ixgbe_max_rss_indices(struct ixgbe_adapter *adapter)

+ 1 - 1
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

@@ -9896,7 +9896,7 @@ ixgbe_features_check(struct sk_buff *skb, struct net_device *dev,
 	 * the TSO, so it's the exception.
 	 * the TSO, so it's the exception.
 	 */
 	 */
 	if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID)) {
 	if (skb->encapsulation && !(features & NETIF_F_TSO_MANGLEID)) {
-#ifdef CONFIG_XFRM
+#ifdef CONFIG_XFRM_OFFLOAD
 		if (!skb->sp)
 		if (!skb->sp)
 #endif
 #endif
 			features &= ~NETIF_F_TSO;
 			features &= ~NETIF_F_TSO;