From a63907b3bbb07724d6526b20ae18ad90f351e954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 22 Jul 2019 10:45:38 +0200 Subject: mac80211: brcmfmac: rename v4.12 patches to allow more backports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki --- ...sure-pointer-correctly-set-if-skb-data-lo.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/kernel/mac80211/patches/319-v4.12-0010-brcmfmac-Ensure-pointer-correctly-set-if-skb-data-lo.patch (limited to 'package/kernel/mac80211/patches/319-v4.12-0010-brcmfmac-Ensure-pointer-correctly-set-if-skb-data-lo.patch') diff --git a/package/kernel/mac80211/patches/319-v4.12-0010-brcmfmac-Ensure-pointer-correctly-set-if-skb-data-lo.patch b/package/kernel/mac80211/patches/319-v4.12-0010-brcmfmac-Ensure-pointer-correctly-set-if-skb-data-lo.patch deleted file mode 100644 index 2fc7c409a8..0000000000 --- a/package/kernel/mac80211/patches/319-v4.12-0010-brcmfmac-Ensure-pointer-correctly-set-if-skb-data-lo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 455a1eb4654c24560eb9dfc634f29cba3d87601e Mon Sep 17 00:00:00 2001 -From: James Hughes -Date: Mon, 24 Apr 2017 12:40:50 +0100 -Subject: [PATCH] brcmfmac: Ensure pointer correctly set if skb data location - changes - -The incoming skb header may be resized if header space is -insufficient, which might change the data adddress in the skb. -Ensure that a cached pointer to that data is correctly set by -moving assignment to after any possible changes. - -Signed-off-by: James Hughes - -Acked-by: Arend van Spriel -Signed-off-by: Kalle Valo ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -198,7 +198,7 @@ static netdev_tx_t brcmf_netdev_start_xm - int ret; - struct brcmf_if *ifp = netdev_priv(ndev); - struct brcmf_pub *drvr = ifp->drvr; -- struct ethhdr *eh = (struct ethhdr *)(skb->data); -+ struct ethhdr *eh; - - brcmf_dbg(DATA, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx); - -@@ -236,6 +236,8 @@ static netdev_tx_t brcmf_netdev_start_xm - goto done; - } - -+ eh = (struct ethhdr *)(skb->data); -+ - if (eh->h_proto == htons(ETH_P_PAE)) - atomic_inc(&ifp->pend_8021x_cnt); - -- cgit v1.2.3