These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / neterion / vxge / vxge-traffic.c

diff --git a/kernel/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/kernel/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
index 9e1aaa7..5f630a2 100644 (file)
--- a/kernel/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
+++ b/kernel/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
@@ -1004,8 +1004,6 @@ void vxge_hw_device_clear_tx_rx(struct __vxge_hw_device *hldev)
 static enum vxge_hw_status
 vxge_hw_channel_dtr_alloc(struct __vxge_hw_channel *channel, void **dtrh)
 {
-       void **tmp_arr;
-
        if (channel->reserve_ptr - channel->reserve_top > 0) {
 _alloc_after_swap:
                *dtrh = channel->reserve_arr[--channel->reserve_ptr];
@@ -1020,10 +1018,7 @@ _alloc_after_swap:
         * i.e. no additional lock need to be done when we free a resource */
 
        if (channel->length - channel->free_ptr > 0) {
-
-               tmp_arr = channel->reserve_arr;
-               channel->reserve_arr = channel->free_arr;
-               channel->free_arr = tmp_arr;
+               swap(channel->reserve_arr, channel->free_arr);
                channel->reserve_ptr = channel->length;
                channel->reserve_top = channel->free_ptr;
                channel->free_ptr = channel->length;