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/701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.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/701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.patch | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.patch b/target/linux/layerscape/patches-5.4/701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.patch deleted file mode 100644 index 9a45bad301..0000000000 --- a/target/linux/layerscape/patches-5.4/701-net-0257-net-mscc-ocelot-export-a-constant-for-the-tag-length.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f53826ed84b6ce7c588949263cc9dedf3c577aa6 Mon Sep 17 00:00:00 2001 -From: Vladimir Oltean <vladimir.oltean@nxp.com> -Date: Thu, 14 Nov 2019 17:03:24 +0200 -Subject: [PATCH] net: mscc: ocelot: export a constant for the tag length in - bytes - -This constant will be used in a future patch to increase the MTU on NPI -ports, and will also be used in the tagger driver for Felix. - -Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> -Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - drivers/net/ethernet/mscc/ocelot.c | 4 ++-- - drivers/net/ethernet/mscc/ocelot.h | 4 ++-- - drivers/net/ethernet/mscc/ocelot_board.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - ---- a/drivers/net/ethernet/mscc/ocelot.c -+++ b/drivers/net/ethernet/mscc/ocelot.c -@@ -576,11 +576,11 @@ static int ocelot_port_xmit(struct sk_bu - struct skb_shared_info *shinfo = skb_shinfo(skb); - struct ocelot_port *ocelot_port = &priv->port; - struct ocelot *ocelot = ocelot_port->ocelot; -+ u32 val, ifh[OCELOT_TAG_LEN / 4]; - struct frame_info info = {}; - u8 grp = 0; /* Send everything on CPU group 0 */ - unsigned int i, count, last; - int port = priv->chip_port; -- u32 val, ifh[IFH_LEN]; - - val = ocelot_read(ocelot, QS_INJ_STATUS); - if (!(val & QS_INJ_STATUS_FIFO_RDY(BIT(grp))) || -@@ -603,7 +603,7 @@ static int ocelot_port_xmit(struct sk_bu - - ocelot_gen_ifh(ifh, &info); - -- for (i = 0; i < IFH_LEN; i++) -+ for (i = 0; i < OCELOT_TAG_LEN / 4; i++) - ocelot_write_rix(ocelot, (__force u32)cpu_to_be32(ifh[i]), - QS_INJ_WR, grp); - ---- a/drivers/net/ethernet/mscc/ocelot.h -+++ b/drivers/net/ethernet/mscc/ocelot.h -@@ -43,8 +43,6 @@ - - #define OCELOT_PTP_QUEUE_SZ 128 - --#define IFH_LEN 4 -- - struct frame_info { - u32 len; - u16 port; -@@ -66,6 +64,8 @@ struct frame_info { - #define IFH_REW_OP_TWO_STEP_PTP 0x3 - #define IFH_REW_OP_ORIGIN_PTP 0x5 - -+#define OCELOT_TAG_LEN 16 -+ - #define OCELOT_SPEED_2500 0 - #define OCELOT_SPEED_1000 1 - #define OCELOT_SPEED_100 2 ---- a/drivers/net/ethernet/mscc/ocelot_board.c -+++ b/drivers/net/ethernet/mscc/ocelot_board.c -@@ -105,7 +105,7 @@ static irqreturn_t ocelot_xtr_irq_handle - int sz, len, buf_len; - struct sk_buff *skb; - -- for (i = 0; i < IFH_LEN; i++) { -+ for (i = 0; i < OCELOT_TAG_LEN / 4; i++) { - err = ocelot_rx_frame_word(ocelot, grp, true, &ifh[i]); - if (err != 4) - break; |