diff options
Diffstat (limited to 'drivers/net/ethernet/google')
| -rw-r--r-- | drivers/net/ethernet/google/gve/gve_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/google/gve/gve_tx_dqo.c | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 1bf446836724..ac4819c25aca 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -696,7 +696,7 @@ static int gve_destroy_rings(struct gve_priv *priv) return 0; } -static inline void gve_rx_free_rings(struct gve_priv *priv) +static void gve_rx_free_rings(struct gve_priv *priv) { if (gve_is_gqi(priv)) gve_rx_free_rings_gqi(priv); diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet/google/gve/gve_tx_dqo.c index a4906b9df540..05ddb6a75c38 100644 --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c @@ -261,7 +261,7 @@ void gve_tx_free_rings_dqo(struct gve_priv *priv) } /* Returns the number of slots available in the ring */ -static inline u32 num_avail_tx_slots(const struct gve_tx_ring *tx) +static u32 num_avail_tx_slots(const struct gve_tx_ring *tx) { u32 num_used = (tx->dqo_tx.tail - tx->dqo_tx.head) & tx->mask; @@ -727,9 +727,8 @@ static void remove_from_list(struct gve_tx_ring *tx, struct gve_index_list *list, struct gve_tx_pending_packet_dqo *pending_packet) { - s16 index, prev_index, next_index; + s16 prev_index, next_index; - index = pending_packet - tx->dqo.pending_packets; prev_index = pending_packet->prev; next_index = pending_packet->next; @@ -890,9 +889,9 @@ static void remove_miss_completions(struct gve_priv *priv, dev_kfree_skb_any(pending_packet->skb); pending_packet->skb = NULL; tx->dropped_pkt++; - net_err_ratelimited("%s: No reinjection completion was received for: %ld.\n", + net_err_ratelimited("%s: No reinjection completion was received for: %d.\n", priv->dev->name, - (pending_packet - tx->dqo.pending_packets)); + (int)(pending_packet - tx->dqo.pending_packets)); pending_packet->state = GVE_PACKET_STATE_TIMED_OUT_COMPL; pending_packet->timeout_jiffies = |