Prev: [16/67] solos-pci: Fix race condition in tasklet RX handling
Next: [65/67] xen: Do not suspend IPI IRQs.
From: Greg KH on 11 Aug 2010 20:20 2.6.35-stable review patch. If anyone has any objections, please let us know. ------------------ From: John W. Linville <linville(a)tuxdriver.com> commit 8f1d2d2be73a98c21e68fe2a26f633892d4abdd1 upstream. ieee80211_beacon_get can return NULL... Signed-off-by: John W. Linville <linville(a)tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- drivers/net/wireless/rtl818x/rtl8180_dev.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/net/wireless/rtl818x/rtl8180_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c @@ -688,6 +688,8 @@ void rtl8180_beacon_work(struct work_str /* grab a fresh beacon */ skb = ieee80211_beacon_get(dev, vif); + if (!skb) + goto resched; /* * update beacon timestamp w/ TSF value -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |