diff options
author | Arend van Spriel <arend@broadcom.com> | 2012-08-30 04:05:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-05 14:53:33 -0400 |
commit | 01e3331b30b48fe96d016435707af050700c8421 (patch) | |
tree | 2b05e46d7fb735634cfd96de2c142a3fc39c6830 /drivers/net | |
parent | 5d9b6f263995d7f43202d76cf2e23d43f9240a90 (diff) |
brcmfmac: fix use of dev_kfree_skb() in irq context
The USB part of the brcmfmac did a dev_kfree_skb() that resulted
in a warning in net/core/skbuff.c:
Jul 11 04:53:33 lb-bun-10 kernel: [53282.667745] WARNING: at
net/core/skbuff.c:490 skb_release_head_state+0xcc/0xe0()
The brcmutil modules provides brcmu_pkt_buf_free_skb() which takes
the context into account. This patch makes use of this function
instead of dev_kfree_skb().
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/usb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index a299d42da8e7..f72dfb70ba0b 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c | |||
@@ -519,7 +519,7 @@ static void brcmf_usb_tx_complete(struct urb *urb) | |||
519 | else | 519 | else |
520 | devinfo->bus_pub.bus->dstats.tx_errors++; | 520 | devinfo->bus_pub.bus->dstats.tx_errors++; |
521 | 521 | ||
522 | dev_kfree_skb(req->skb); | 522 | brcmu_pkt_buf_free_skb(req->skb); |
523 | req->skb = NULL; | 523 | req->skb = NULL; |
524 | brcmf_usb_enq(devinfo, &devinfo->tx_freeq, req); | 524 | brcmf_usb_enq(devinfo, &devinfo->tx_freeq, req); |
525 | 525 | ||
@@ -540,7 +540,7 @@ static void brcmf_usb_rx_complete(struct urb *urb) | |||
540 | devinfo->bus_pub.bus->dstats.rx_packets++; | 540 | devinfo->bus_pub.bus->dstats.rx_packets++; |
541 | } else { | 541 | } else { |
542 | devinfo->bus_pub.bus->dstats.rx_errors++; | 542 | devinfo->bus_pub.bus->dstats.rx_errors++; |
543 | dev_kfree_skb(skb); | 543 | brcmu_pkt_buf_free_skb(skb); |
544 | brcmf_usb_enq(devinfo, &devinfo->rx_freeq, req); | 544 | brcmf_usb_enq(devinfo, &devinfo->rx_freeq, req); |
545 | return; | 545 | return; |
546 | } | 546 | } |
@@ -556,7 +556,7 @@ static void brcmf_usb_rx_complete(struct urb *urb) | |||
556 | brcmf_usb_rx_refill(devinfo, req); | 556 | brcmf_usb_rx_refill(devinfo, req); |
557 | } | 557 | } |
558 | } else { | 558 | } else { |
559 | dev_kfree_skb(skb); | 559 | brcmu_pkt_buf_free_skb(skb); |
560 | } | 560 | } |
561 | return; | 561 | return; |
562 | 562 | ||
@@ -588,7 +588,7 @@ static void brcmf_usb_rx_refill(struct brcmf_usbdev_info *devinfo, | |||
588 | if (ret == 0) { | 588 | if (ret == 0) { |
589 | brcmf_usb_enq(devinfo, &devinfo->rx_postq, req); | 589 | brcmf_usb_enq(devinfo, &devinfo->rx_postq, req); |
590 | } else { | 590 | } else { |
591 | dev_kfree_skb(req->skb); | 591 | brcmu_pkt_buf_free_skb(req->skb); |
592 | req->skb = NULL; | 592 | req->skb = NULL; |
593 | brcmf_usb_enq(devinfo, &devinfo->rx_freeq, req); | 593 | brcmf_usb_enq(devinfo, &devinfo->rx_freeq, req); |
594 | } | 594 | } |