diff options
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/lio_main.c')
-rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index 872765527081..34d269cd5579 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c | |||
@@ -1683,7 +1683,7 @@ static int octeon_setup_droq(struct octeon_device *oct, int q_no, int num_descs, | |||
1683 | dev_dbg(&oct->pci_dev->dev, "Creating Droq: %d\n", q_no); | 1683 | dev_dbg(&oct->pci_dev->dev, "Creating Droq: %d\n", q_no); |
1684 | /* droq creation and local register settings. */ | 1684 | /* droq creation and local register settings. */ |
1685 | ret_val = octeon_create_droq(oct, q_no, num_descs, desc_size, app_ctx); | 1685 | ret_val = octeon_create_droq(oct, q_no, num_descs, desc_size, app_ctx); |
1686 | if (ret_val == -1) | 1686 | if (ret_val < 0) |
1687 | return ret_val; | 1687 | return ret_val; |
1688 | 1688 | ||
1689 | if (ret_val == 1) { | 1689 | if (ret_val == 1) { |
@@ -2524,7 +2524,7 @@ static void handle_timestamp(struct octeon_device *oct, | |||
2524 | 2524 | ||
2525 | octeon_swap_8B_data(&resp->timestamp, 1); | 2525 | octeon_swap_8B_data(&resp->timestamp, 1); |
2526 | 2526 | ||
2527 | if (unlikely((skb_shinfo(skb)->tx_flags | SKBTX_IN_PROGRESS) != 0)) { | 2527 | if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS) != 0)) { |
2528 | struct skb_shared_hwtstamps ts; | 2528 | struct skb_shared_hwtstamps ts; |
2529 | u64 ns = resp->timestamp; | 2529 | u64 ns = resp->timestamp; |
2530 | 2530 | ||