From 1287154edf9e778e49225f1651cfcbeb1d4099ee Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Wed, 9 Nov 2005 11:30:51 -0800
Subject: [PATCH] --- yaml --- r: 14437 b: refs/heads/master c:
 cea00da3972806d213a7dbe1b98e889435385e6b h: refs/heads/master i:   14435:
 de6f7a04be09a28aed22f373e86a6f3e99327ab3 v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/ieee80211.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5d67109c820a..a51eca2514c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5b42f343d19d0a04782db0dde5b128dd282f95c
+refs/heads/master: cea00da3972806d213a7dbe1b98e889435385e6b
diff --git a/trunk/include/net/ieee80211.h b/trunk/include/net/ieee80211.h
index b93fd8c1d884..cde2f4f4f501 100644
--- a/trunk/include/net/ieee80211.h
+++ b/trunk/include/net/ieee80211.h
@@ -1042,7 +1042,7 @@ static inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr)
 	case IEEE80211_4ADDR_LEN:
 		return ((struct ieee80211_hdr_4addr *)hdr)->payload;
 	}
-
+	return NULL;
 }
 
 static inline int ieee80211_is_ofdm_rate(u8 rate)