From 6d853e81c8a5aee47047e08e7dc4b3cf2b239d78 Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Wed, 22 Jun 2016 16:32:55 +0200 Subject: mac80211: remove unneeded patch with updated mac80211 Signed-off-by: Zoltan HERPAI --- ...sting-the-wrong-variable-in-brcmf_rx_hdrp.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/kernel/mac80211/patches/351-0001-brcmfmac-testing-the-wrong-variable-in-brcmf_rx_hdrp.patch (limited to 'package/kernel') diff --git a/package/kernel/mac80211/patches/351-0001-brcmfmac-testing-the-wrong-variable-in-brcmf_rx_hdrp.patch b/package/kernel/mac80211/patches/351-0001-brcmfmac-testing-the-wrong-variable-in-brcmf_rx_hdrp.patch deleted file mode 100644 index 11c65a49ed..0000000000 --- a/package/kernel/mac80211/patches/351-0001-brcmfmac-testing-the-wrong-variable-in-brcmf_rx_hdrp.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Dan Carpenter -Date: Tue, 19 Apr 2016 07:25:43 -0700 -Subject: [PATCH] brcmfmac: testing the wrong variable in brcmf_rx_hdrpull() - -Smatch complains about this code: - - drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c:335 brcmf_rx_hdrpull() - error: we previously assumed '*ifp' could be null (see line 333) - -The problem is that we recently changed these from "ifp" to "*ifp" but -there was one that we didn't update. - -- if (ret || !ifp || !ifp->ndev) { -+ if (ret || !(*ifp) || !(*ifp)->ndev) { - if (ret != -ENODATA && ifp) - ^^^ -- ifp->stats.rx_errors++; -+ (*ifp)->stats.rx_errors++; - -I have updated it to *ifp as well. We always call this function is a -non-NULL "ifp" pointer, btw. - -Fixes: c462ebcdfe42 ('brcmfmac: create common function for handling brcmf_proto_hdrpull()') -Signed-off-by: Dan Carpenter -Acked-by: Arend van Spriel -Signed-off-by: Kalle Valo ---- - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -331,7 +331,7 @@ static int brcmf_rx_hdrpull(struct brcmf - ret = brcmf_proto_hdrpull(drvr, true, skb, ifp); - - if (ret || !(*ifp) || !(*ifp)->ndev) { -- if (ret != -ENODATA && ifp) -+ if (ret != -ENODATA && *ifp) - (*ifp)->stats.rx_errors++; - brcmu_pkt_buf_free_skb(skb); - return -ENODATA; -- cgit v1.2.3