drop a broken 3.18 and a broken 4.4 patch

diff --git a/queue-3.18/bgmac-add-check-for-oversized-packets.patch b/queue-3.18/bgmac-add-check-for-oversized-packets.patch
deleted file mode 100644 (file)
index 69315af..0000000
--- a/queue-3.18/bgmac-add-check-for-oversized-packets.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6a6c708469c9e10fd87adcc3abff164270538d62 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@openwrt.org>
-Date: Tue, 14 Apr 2015 12:07:58 +0200
-Subject: bgmac: add check for oversized packets
-
-From: Felix Fietkau <nbd@openwrt.org>
-
-commit 6a6c708469c9e10fd87adcc3abff164270538d62 upstream.
-
-In very rare cases, the MAC can catch an internal buffer that is bigger
-than it's supposed to be. Instead of crashing the kernel, simply pass
-the buffer back to the hardware
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/ethernet/broadcom/bgmac.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/bgmac.c
-+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -373,6 +373,13 @@ static int bgmac_dma_rx_read(struct bgma
-                               break;
-                       }
- 
-+                      if (len > BGMAC_RX_ALLOC_SIZE) {
-+                              bgmac_err(bgmac, "Found oversized packet at slot %d, DMA issue!\n",
-+                                        ring->start);
-+                              put_page(virt_to_head_page(buf));
-+                              break;
-+                      }
-+
-                       /* Omit CRC. */
-                       len -= ETH_FCS_LEN;
- 

diff --git a/queue-3.18/bgmac-reset-enable-ethernet-core-before-using-it.patch b/queue-3.18/bgmac-reset-enable-ethernet-core-before-using-it.patch
index f3bf0227e2a75a0b0072e9b755f74068fa4aa846..491d32e94882eba21a8dda2c6947d7928f25bb75 100644 (file)
--- a/queue-3.18/bgmac-reset-enable-ethernet-core-before-using-it.patch
+++ b/queue-3.18/bgmac-reset-enable-ethernet-core-before-using-it.patch
@@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1438,6 +1438,11 @@ static int bgmac_probe(struct bcma_devic
+@@ -1431,6 +1431,11 @@ static int bgmac_probe(struct bcma_devic
                dev_warn(&core->dev, "Using random MAC: %pM\n", mac);
        }
  

diff --git a/queue-3.18/series b/queue-3.18/series
index 97701dc78d48ad1ee6053dfd186a506582d0c81a..836605c95bcbade4317ab097cc99a2f4dad86aa4 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1,7 +1,6 @@
 driver-core-platform-fix-race-condition-with-driver_override.patch
 mips-uapi-ignore-__arch_swab-16-32-64-when-using-mips16.patch
 bgmac-fix-device-initialization-on-northstar-socs-condition-typo.patch
-bgmac-add-check-for-oversized-packets.patch
 bgmac-reset-enable-ethernet-core-before-using-it.patch
 usb-ehci-orion-fix-probe-for-generic_phy.patch
 tracing-kprobes-allow-to-create-probe-with-a-module-name-starting-with-a-digit.patch

diff --git a/queue-4.4/pinctrl-sh-pfc-r8a7791-add-missing-dvc_mute-signal.patch b/queue-4.4/pinctrl-sh-pfc-r8a7791-add-missing-dvc_mute-signal.patch
deleted file mode 100644 (file)
index 24141c9..0000000
--- a/queue-4.4/pinctrl-sh-pfc-r8a7791-add-missing-dvc_mute-signal.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 3908632fb829d73317c64c3d04f584b49f62e4ae Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Date: Wed, 29 Mar 2017 21:36:51 +0300
-Subject: pinctrl: sh-pfc: r8a7791: Add missing DVC_MUTE signal
-
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-
-commit 3908632fb829d73317c64c3d04f584b49f62e4ae upstream.
-
-The R8A7791 PFC driver  was apparently based on the preliminary revisions
-of  the user's  manual, which  omitted the DVC_MUTE signal  altogether in
-the PFC section. The modern manual has the signal described,  so just add
-the necassary data to the driver...
-
-Fixes: 508845196238 ("pinctrl: sh-pfc: r8a7791 PFC support")
-Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/pinctrl/sh-pfc/pfc-r8a7791.c |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-@@ -206,7 +206,7 @@ enum {
- 
-       /* IPSR6 */
-       FN_AUDIO_CLKB, FN_STP_OPWM_0_B, FN_MSIOF1_SCK_B,
--      FN_SCIF_CLK, FN_BPFCLK_E,
-+      FN_SCIF_CLK, FN_DVC_MUTE, FN_BPFCLK_E,
-       FN_AUDIO_CLKC, FN_SCIFB0_SCK_C, FN_MSIOF1_SYNC_B, FN_RX2,
-       FN_SCIFA2_RXD, FN_FMIN_E,
-       FN_AUDIO_CLKOUT, FN_MSIOF1_SS1_B, FN_TX2, FN_SCIFA2_TXD,
-@@ -576,7 +576,7 @@ enum {
- 
-       /* IPSR6 */
-       AUDIO_CLKB_MARK, STP_OPWM_0_B_MARK, MSIOF1_SCK_B_MARK,
--      SCIF_CLK_MARK, BPFCLK_E_MARK,
-+      SCIF_CLK_MARK, DVC_MUTE_MARK, BPFCLK_E_MARK,
-       AUDIO_CLKC_MARK, SCIFB0_SCK_C_MARK, MSIOF1_SYNC_B_MARK, RX2_MARK,
-       SCIFA2_RXD_MARK, FMIN_E_MARK,
-       AUDIO_CLKOUT_MARK, MSIOF1_SS1_B_MARK, TX2_MARK, SCIFA2_TXD_MARK,
-@@ -1093,6 +1093,7 @@ static const u16 pinmux_data[] = {
-       PINMUX_IPSR_MSEL(IP6_2_0, STP_OPWM_0_B, SEL_SSP_1),
-       PINMUX_IPSR_MSEL(IP6_2_0, MSIOF1_SCK_B, SEL_SOF1_1),
-       PINMUX_IPSR_MSEL(IP6_2_0, SCIF_CLK, SEL_SCIF_0),
-+      PINMUX_IPSR_GPSR(IP6_2_0, DVC_MUTE),
-       PINMUX_IPSR_MSEL(IP6_2_0, BPFCLK_E, SEL_FM_4),
-       PINMUX_IPSR_DATA(IP6_5_3, AUDIO_CLKC),
-       PINMUX_IPSR_MSEL(IP6_5_3, SCIFB0_SCK_C, SEL_SCIFB_2),
-@@ -5696,7 +5697,7 @@ static const struct pinmux_cfg_reg pinmu
-               0, 0,
-               /* IP6_2_0 [3] */
-               FN_AUDIO_CLKB, FN_STP_OPWM_0_B, FN_MSIOF1_SCK_B,
--              FN_SCIF_CLK, 0, FN_BPFCLK_E,
-+              FN_SCIF_CLK, FN_DVC_MUTE, FN_BPFCLK_E,
-               0, 0, }
-       },
-       { PINMUX_CFG_REG_VAR("IPSR7", 0xE606003C, 32,

diff --git a/queue-4.4/series b/queue-4.4/series
index db4573db11c7ccff791f4ea3a405214263ccf797..539d0a4106280a9c936ef37331605afa966a992f 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -14,7 +14,6 @@ mac80211_hwsim-replace-bogus-hrtimer-clockid.patch
 sysctl-don-t-print-negative-flag-for-proc_douintvec.patch
 sysctl-report-einval-if-value-is-larger-than-uint_max-for-proc_douintvec.patch
 pinctrl-sh-pfc-r8a7791-fix-scif2-pinmux-data.patch
-pinctrl-sh-pfc-r8a7791-add-missing-dvc_mute-signal.patch
 pinctrl-meson-meson8b-fix-the-nand-dqs-pins.patch
 pinctrl-sunxi-fix-spdif-function-name-for-a83t.patch
 pinctrl-mxs-atomically-switch-mux-and-drive-strength-config.patch