diff --git a/[refs] b/[refs]
index 18be038ada2d..848a6f19d945 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6110781af080c007b2202187a8518920e03d5748
+refs/heads/master: 5e3f308997f53d00e8cbebdb89d4f6e347aa963a
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index a0371caf01ce..ab6b73647b3e 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -341,7 +341,8 @@ static void ieee80211_tasklet_handler(unsigned long data)
 			dev_kfree_skb(skb);
 			break ;
 		default:
-			WARN_ON(1);
+			WARN(1, "mac80211: Packet is of unknown type %d\n",
+			     skb->pkt_type);
 			dev_kfree_skb(skb);
 			break;
 		}