]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fuzz cleanup
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 7 May 2020 16:39:39 +0000 (18:39 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 7 May 2020 16:39:39 +0000 (18:39 +0200)
queue-4.14/net-systemport-suppress-warnings-on-failed-rx-skb-al.patch
queue-4.19/net-systemport-suppress-warnings-on-failed-rx-skb-al.patch

index 1e98a8b07baf834c3dc21e134eafdf9b3206693e..1b220d0aaa2da6218abe9c5aaec56b3989326739 100644 (file)
@@ -25,14 +25,12 @@ Acked-by: Florian Fainelli <f.fainelli@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/broadcom/bcmsysport.c | 3 ++-
+ drivers/net/ethernet/broadcom/bcmsysport.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
-index f48f7d104af21..123ee5c11bc0c 100644
 --- a/drivers/net/ethernet/broadcom/bcmsysport.c
 +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
-@@ -645,7 +645,8 @@ static struct sk_buff *bcm_sysport_rx_refill(struct bcm_sysport_priv *priv,
+@@ -645,7 +645,8 @@ static struct sk_buff *bcm_sysport_rx_re
        dma_addr_t mapping;
  
        /* Allocate a new SKB for a new packet */
@@ -42,6 +40,3 @@ index f48f7d104af21..123ee5c11bc0c 100644
        if (!skb) {
                priv->mib.alloc_rx_buff_failed++;
                netif_err(priv, rx_err, ndev, "SKB alloc failed\n");
--- 
-2.20.1
-
index 70cf4479ab92dcf72ab97db803a93210bcce5958..92b397c9ba9eff0aa26e7a96f64bdc5204e5c865 100644 (file)
@@ -25,14 +25,12 @@ Acked-by: Florian Fainelli <f.fainelli@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/ethernet/broadcom/bcmsysport.c | 3 ++-
+ drivers/net/ethernet/broadcom/bcmsysport.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
-index 3fdf135bad56e..6b761f6b8fd56 100644
 --- a/drivers/net/ethernet/broadcom/bcmsysport.c
 +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
-@@ -677,7 +677,8 @@ static struct sk_buff *bcm_sysport_rx_refill(struct bcm_sysport_priv *priv,
+@@ -677,7 +677,8 @@ static struct sk_buff *bcm_sysport_rx_re
        dma_addr_t mapping;
  
        /* Allocate a new SKB for a new packet */
@@ -42,6 +40,3 @@ index 3fdf135bad56e..6b761f6b8fd56 100644
        if (!skb) {
                priv->mib.alloc_rx_buff_failed++;
                netif_err(priv, rx_err, ndev, "SKB alloc failed\n");
--- 
-2.20.1
-