diff options
author | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 01:16:48 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 13:11:56 +0000 |
commit | 786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch) | |
tree | 926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/layerscape/patches-5.4/809-jailhouse-0019-ivshmem-net-Switch-to-netdev_xmit_more-helper.patch | |
parent | 9470160c350d15f765c33d6c1db15d6c4709a64c (diff) | |
download | upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.gz upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.bz2 upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.zip |
kernel: delete Linux 5.4 config and patches
As the upcoming release will be based on Linux 5.10 only, remove all
kernel configuration as well as patches for Linux 5.4.
There were no targets still actively using Linux 5.4.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606)
Diffstat (limited to 'target/linux/layerscape/patches-5.4/809-jailhouse-0019-ivshmem-net-Switch-to-netdev_xmit_more-helper.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/809-jailhouse-0019-ivshmem-net-Switch-to-netdev_xmit_more-helper.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/target/linux/layerscape/patches-5.4/809-jailhouse-0019-ivshmem-net-Switch-to-netdev_xmit_more-helper.patch b/target/linux/layerscape/patches-5.4/809-jailhouse-0019-ivshmem-net-Switch-to-netdev_xmit_more-helper.patch deleted file mode 100644 index 3346871d8e..0000000000 --- a/target/linux/layerscape/patches-5.4/809-jailhouse-0019-ivshmem-net-Switch-to-netdev_xmit_more-helper.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6732a2821cf7eeffa284253f80fd757e1ac2df4f 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] 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> -(cherry picked from commit 80c301552ec0b500dd46a2b4f0c9fef78a610ee6) ---- - drivers/net/ivshmem-net.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - ---- a/drivers/net/ivshmem-net.c -+++ b/drivers/net/ivshmem-net.c -@@ -294,7 +294,8 @@ static u32 ivshm_net_tx_advance(struct i - 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 - 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_st - 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++; |