Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-07-11 12:11:49 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-07-11 12:11:49 +0200
commit103368c38dffd4ab24e08d05bbb8f6ab5b8234a8 (patch)
tree6e71ef9d483c102a399a7fb56ca88841a5051c98
parented2ce9a0ed22e194ad813b9f84a18431059efa48 (diff)
parent52f8237391f7e5f57ced16b25c8fb3cff4d17557 (diff)
Merge branch 'users/tbogendoerfer/SLE15-SP1/for-next' into SLE15-SP1
Pull an ixgbe fix from Thomas Bogendoerfer suse-commit: 4665cb5a1b87491e3bb36eb70ad474ec46215fba
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
index 4ef0394b495a..1045ebbc2328 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
@@ -866,6 +866,9 @@ void ixgbe_ipsec_vf_clear(struct ixgbe_adapter *adapter, u32 vf)
struct ixgbe_ipsec *ipsec = adapter->ipsec;
int i;
+ if (!ipsec)
+ return;
+
/* search rx sa table */
for (i = 0; i < IXGBE_IPSEC_MAX_SA_COUNT && ipsec->num_rx_sa; i++) {
if (!ipsec->rx_tbl[i].used)