Skip to content

Commit

Permalink
Merge pull request linux4kix#10 from linux4kix/linux-linaro-lsk-v3.14…
Browse files Browse the repository at this point in the history
…-mx6

brcmfmac: kernel oops on wrong ifidx
  • Loading branch information
rabeeh committed Sep 28, 2014
2 parents c841c70 + d662e18 commit 07da1e8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ static void brcmf_rxreorder_process_info(struct brcmf_if *ifp, u8 *reorder_data,

void brcmf_rx_frame(struct device *dev, struct sk_buff *skb)
{
struct brcmf_if *ifp;
struct brcmf_if *ifp = NULL;
struct brcmf_bus *bus_if = dev_get_drvdata(dev);
struct brcmf_pub *drvr = bus_if->drvr;
struct brcmf_skb_reorder_data *rd;
Expand All @@ -525,7 +525,7 @@ void brcmf_rx_frame(struct device *dev, struct sk_buff *skb)

/* process and remove protocol-specific header */
ret = brcmf_proto_hdrpull(drvr, true, &ifidx, skb);
ifp = drvr->iflist[ifidx];
if (!ret) ifp = drvr->iflist[ifidx];

if (ret || !ifp || !ifp->ndev) {
if ((ret != -ENODATA) && ifp)
Expand Down

0 comments on commit 07da1e8

Please sign in to comment.