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

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

ixgbe: Move ipsec init function to before reset call 



This patch moves the IPsec init function in ixgbe_sw_init. This way it is a
bit more consistent with the placement of similar initialization functions
and is placed before the reset_hw call which should allow us to clean up
any link issues that may be introduced by the fact that we force the link
up if somehow the device had IPsec still enabled before the driver was
loaded.

In addition to the function move it is necessary to change the assignment
of netdev->features. The easiest way to do this is to just test for the
existence of adapter->ipsec and if it is present we set the feature bits.

Fixes: 49a94d74 ("ixgbe: add ipsec engine start and stop routines")
Reported-by: default avatarAndre Tomt <andre@tomt.net>
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 e433f3a5

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

+0 −7
Original line number Diff line number Diff line
@@ -1001,13 +1001,6 @@ void ixgbe_init_ipsec_offload(struct ixgbe_adapter *adapter) 


	adapter->netdev->xfrmdev_ops = &ixgbe_xfrmdev_ops;



#define IXGBE_ESP_FEATURES	(NETIF_F_HW_ESP | \

				 NETIF_F_HW_ESP_TX_CSUM | \

				 NETIF_F_GSO_ESP)



	adapter->netdev->features |= IXGBE_ESP_FEATURES;

	adapter->netdev->hw_enc_features |= IXGBE_ESP_FEATURES;



	return;



err2:

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

+9 −2
Original line number Diff line number Diff line
@@ -6117,6 +6117,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter, 
#ifdef CONFIG_IXGBE_DCB

	ixgbe_init_dcb(adapter);

#endif

	ixgbe_init_ipsec_offload(adapter);



	/* default flow control settings */

	hw->fc.requested_mode = ixgbe_fc_full;
@@ -10429,6 +10430,14 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (hw->mac.type >= ixgbe_mac_82599EB)

		netdev->features |= NETIF_F_SCTP_CRC;



#ifdef CONFIG_XFRM_OFFLOAD

#define IXGBE_ESP_FEATURES	(NETIF_F_HW_ESP | \

				 NETIF_F_HW_ESP_TX_CSUM | \

				 NETIF_F_GSO_ESP)



	if (adapter->ipsec)

		netdev->features |= IXGBE_ESP_FEATURES;

#endif

	/* copy netdev features into list of user selectable features */

	netdev->hw_features |= netdev->features |

			       NETIF_F_HW_VLAN_CTAG_FILTER |
@@ -10491,8 +10500,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
					 NETIF_F_FCOE_MTU;

	}

#endif /* IXGBE_FCOE */

	ixgbe_init_ipsec_offload(adapter);



	if (adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE)

		netdev->hw_features |= NETIF_F_LRO;

	if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED)