diff options
| author | popcornmix <popcornmix@gmail.com> | 2016-09-15 13:20:44 +0100 |
|---|---|---|
| committer | popcornmix <popcornmix@gmail.com> | 2016-09-15 13:20:44 +0100 |
| commit | 2d31cd571e6f2ac61a3eda273d973058e1bb1f58 (patch) | |
| tree | 640893fdb9ce69915cde3f189cff835ce4d6c3fa /drivers/net/ethernet/intel/i40evf/i40evf_main.c | |
| parent | 24e62728b3fc4f118c8ae17b374bce189bb188fc (diff) | |
| parent | 1d074db69c46d62ce82b331c2080e2fcb710bf4a (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into rpi-4.4.yraspberrypi-kernel_1.20160921-1
Diffstat (limited to 'drivers/net/ethernet/intel/i40evf/i40evf_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40evf_main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index 99d2cffae0cd..5f03ab3dfa19 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c @@ -1864,6 +1864,9 @@ void i40evf_free_all_tx_resources(struct i40evf_adapter *adapter) { int i; + if (!adapter->tx_rings) + return; + for (i = 0; i < adapter->num_active_queues; i++) if (adapter->tx_rings[i]->desc) i40evf_free_tx_resources(adapter->tx_rings[i]); @@ -1932,6 +1935,9 @@ void i40evf_free_all_rx_resources(struct i40evf_adapter *adapter) { int i; + if (!adapter->rx_rings) + return; + for (i = 0; i < adapter->num_active_queues; i++) if (adapter->rx_rings[i]->desc) i40evf_free_rx_resources(adapter->rx_rings[i]); |