1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From 6c86f9ef9fa5029b8f87867f47fe51d6cc1960a5 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 2 Jun 2019 11:58:20 +0200
Subject: [PATCH 31/32] ivshmem-net: Switch to netdev_xmit_more helper
The skb field has been removed by 4f296edeb9d4.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
drivers/net/ivshmem-net.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ivshmem-net.c b/drivers/net/ivshmem-net.c
index aba77c232c48..9946cef63c1f 100644
--- a/drivers/net/ivshmem-net.c
+++ b/drivers/net/ivshmem-net.c
@@ -294,7 +294,8 @@ static u32 ivshm_net_tx_advance(struct ivshm_net_queue *q, u32 *pos, u32 len)
return p;
}
-static int ivshm_net_tx_frame(struct net_device *ndev, struct sk_buff *skb)
+static int ivshm_net_tx_frame(struct net_device *ndev, struct sk_buff *skb,
+ bool xmit_more)
{
struct ivshm_net *in = netdev_priv(ndev);
struct ivshm_net_queue *tx = &in->tx;
@@ -327,7 +328,7 @@ static int ivshm_net_tx_frame(struct net_device *ndev, struct sk_buff *skb)
vr->avail->ring[avail] = desc_idx;
tx->num_added++;
- if (!skb->xmit_more) {
+ if (!xmit_more) {
virt_store_release(&vr->avail->idx, tx->last_avail_idx);
ivshm_net_notify_tx(in, tx->num_added);
tx->num_added = 0;
@@ -509,17 +510,18 @@ static int ivshm_net_poll(struct napi_struct *napi, int budget)
static netdev_tx_t ivshm_net_xmit(struct sk_buff *skb, struct net_device *ndev)
{
struct ivshm_net *in = netdev_priv(ndev);
+ bool xmit_more = netdev_xmit_more();
ivshm_net_tx_clean(ndev);
if (!ivshm_net_tx_ok(in, ndev->mtu)) {
ivshm_net_enable_tx_irq(in);
netif_stop_queue(ndev);
- skb->xmit_more = 0;
+ xmit_more = false;
in->stats.tx_pause++;
}
- ivshm_net_tx_frame(ndev, skb);
+ ivshm_net_tx_frame(ndev, skb, xmit_more);
in->stats.tx_packets++;
ndev->stats.tx_packets++;
--
2.11.0
|
