Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.26

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 09f023089ea4..05af7316f698 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -145,14 +145,14 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
         struct net_device *dev = priv->dev;
         struct rxpackethdr *p_rx_pkt;
         struct rxpd *p_rx_pd;
-
         int hdrchop;
         struct ethhdr *p_ethhdr;
-
         const u8 rfc1042_eth_hdr[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
 
         lbs_deb_enter(LBS_DEB_RX);
 
+        BUG_ON(!skb);
+
         skb->ip_summed = CHECKSUM_NONE;
 
         if (priv->monitormode)