diff --git a/[refs] b/[refs]
index ecce3ea4cebc..d0d5553a9be8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f956c34e2a665a1c457d0af7db7604b22f5acb19
+refs/heads/master: 54d5026e7c173edae8a27c293c286f1783d21ae8
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
index dc1123aa8181..72eddd1b410b 100644
--- a/trunk/include/net/mac80211.h
+++ b/trunk/include/net/mac80211.h
@@ -3567,8 +3567,9 @@ rate_lowest_index(struct ieee80211_supported_band *sband,
 			return i;
 
 	/* warn when we cannot find a rate. */
-	WARN_ON(1);
+	WARN_ON_ONCE(1);
 
+	/* and return 0 (the lowest index) */
 	return 0;
 }