]> git.baikalelectronics.ru Git - kernel.git/commit
staging: brcm80211: remove assert to avoid panic since 2.6.37 kernel
authorArend van Spriel <arend@broadcom.com>
Fri, 21 Jan 2011 12:34:15 +0000 (13:34 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 22 Jan 2011 14:32:22 +0000 (06:32 -0800)
commit89e6b43644919698befa987709224baacd66ea67
treeb3dbe71721cb3fad3163d5895d457f82997b7366
parent23c6cce9fa0ee2d9afb294718bdc43a301056871
staging: brcm80211: remove assert to avoid panic since 2.6.37 kernel

The driver assumed it would receive skb packets from MAC80211 which
are not cloned. To guard this assumption an assert was placed in
the transmit routine. As of kernel 2.6.37 it turns out MAC80211 does
pass skb packets that are cloned. The assert is also not needed as
it does not lead to a failure state in our driver when the packet is
cloned. Therefore the assert can safely be removed.

> commit 854f163bb026a472499278a83bb6a1860740c336
> Author: Felix Fietkau <nbd@openwrt.org>
> Date:   Sat Dec 18 19:30:50 2010 +0100
>
>     mac80211: fix potentially redundant skb data copying
>
>     When an skb is shared, it needs to be duplicated, along with its data
>     If the skb does not have enough headroom, using skb_copy might cause t
>     buffer to be copied twice (once by skb_copy and once by pskb_expand_he
>     Fix this by using skb_clone initially and letting ieee80211_skb_resize
>     out the rest.
>
>     Signed-off-by: Felix Fietkau <nbd@openwrt.org>
>     Signed-off-by: John W. Linville <linville@tuxdriver.com>
>

Acked-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/sys/wlc_mac80211.c