Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

[linux-2.6-omap-h63xx.git] / include / net / ieee80211.h

diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index b93fd8c1d8847f6488667f60512ee3a9a70bb077..cde2f4f4f501775d968a343d75ec8a2b0859c7e5 100644 (file)
--- a/include/net/ieee80211.h
+++ b/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)