Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/i40e/i40e_main.c between commit 3c325ced6aef
("i40e: fix null dereference") from Linus' tree and commit bc7d338fbb3f
("i40e: reinit flow for the main VSI") from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
index 12b0932204ba,fba0aada062a..000000000000
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@@ -354,8 -354,8 +354,10 @@@ static struct rtnl_link_stats64 *i40e_g
struct rtnl_link_stats64 *vsi_stats = i40e_get_vsi_stats_struct(vsi);
int i;
+ if (!vsi->tx_rings)
+ return stats;
+ if (test_bit(__I40E_DOWN, &vsi->state))
+ return stats;
rcu_read_lock();
for (i = 0; i < vsi->num_queue_pairs; i++) {
pgp9GuUq9v24Z.pgp
Description: PGP signature
