This patch doesn't apply to the .37 stable tree If someone wants it applied there, please email the backport to [email protected]
thanks, greg k-h > commit: d062d44a8386c82c06e483f0c0d1124ba3cab2c8 > From: Arend van Spriel <[email protected]> > Date: Fri, 21 Jan 2011 13:34:15 +0100 > Subject: [PATCH] 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 f8a0a781488ec7288d1049e5d2022850aa98f7b6 > > Author: Felix Fietkau <[email protected]> > > 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 <[email protected]> > > Signed-off-by: John W. Linville <[email protected]> > > > > Acked-by: Brett Rudley <[email protected]> > Signed-off-by: Arend van Spriel <[email protected]> > Cc: stable <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > --- > drivers/staging/brcm80211/sys/wlc_mac80211.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c > b/drivers/staging/brcm80211/sys/wlc_mac80211.c > index 1d5d01a..a130386 100644 > --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c > +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c > @@ -5126,7 +5126,6 @@ wlc_sendpkt_mac80211(struct wlc_info *wlc, struct > sk_buff *sdu, > fifo = prio2fifo[prio]; > > ASSERT((uint) skb_headroom(sdu) >= TXOFF); > - ASSERT(!(sdu->cloned)); > ASSERT(!(sdu->next)); > ASSERT(!(sdu->prev)); > ASSERT(fifo < NFIFO); > > _______________________________________________ > stable mailing list > [email protected] > http://linux.kernel.org/mailman/listinfo/stable _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
