rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Update gcp patch

Browse Source
This commit is contained in:
eabdullin 2023-05-31 11:10:12 +03:00
parent 15c3be7150
commit 66a9849834
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
SOURCES/0001-Apply-GCP-related-changes.patch
View File

@ -326,12 +326,12 @@ index 54e51c822..5ffb9b200 100644
static netdev_tx_t gve_start_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t gve_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct gve_priv *priv = netdev_priv(dev); struct gve_priv *priv = netdev_priv(dev);
@@ -526,8 +571,7 @@ static void gve_add_napi(struct gve_priv *priv, int ntfy_idx, @@ -525,8 +570,7 @@
int (*gve_poll)(struct napi_struct *, int))
{ {
struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx]; struct gve_notify_block *block = &priv->ntfy_blocks[ntfy_idx];
-
- netif_napi_add(priv->dev, &block->napi, gve_poll, - netif_napi_add(priv->dev, &block->napi, gve_poll);
- NAPI_POLL_WEIGHT);
+ netif_napi_add(priv->dev, &block->napi, gve_poll, 64); + netif_napi_add(priv->dev, &block->napi, gve_poll, 64);
} }
@ -1145,13 +1145,11 @@ diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet
index ec394d991..9ae567077 100644 index ec394d991..9ae567077 100644
--- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c
+++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c
@@ -598,9 +598,9 @@ static int gve_num_buffer_descs_needed(const struct sk_buff *skb) @@ -600,7 +600,7 @@
*/
static bool gve_can_send_tso(const struct sk_buff *skb)
{ {
- const int header_len = skb_checksum_start_offset(skb) + tcp_hdrlen(skb);
const int max_bufs_per_seg = GVE_TX_MAX_DATA_DESCS - 1; const int max_bufs_per_seg = GVE_TX_MAX_DATA_DESCS - 1;
const struct skb_shared_info *shinfo = skb_shinfo(skb); const struct skb_shared_info *shinfo = skb_shinfo(skb);
- const int header_len = skb_tcp_all_headers(skb);
+ const int header_len = skb_transport_offset(skb) + tcp_hdrlen(skb); + const int header_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
const int gso_size = shinfo->gso_size; const int gso_size = shinfo->gso_size;
int cur_seg_num_bufs; int cur_seg_num_bufs;