summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-18 13:36:39 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-18 13:36:39 -0500
commit97bae8dc961f59e81e85c7f92ff04f5ff73c20e8 (patch)
tree4b1d350e36c76cf1d1665292976af8cc10d57e4c /include
parent15d014d13149aedd76cbff1b5c3bbfe839391457 (diff)
parentcea00da3972806d213a7dbe1b98e889435385e6b (diff)
downloadop-kernel-dev-97bae8dc961f59e81e85c7f92ff04f5ff73c20e8.zip
op-kernel-dev-97bae8dc961f59e81e85c7f92ff04f5ff73c20e8.tar.gz
Merge branch 'upstream-fixes'
Diffstat (limited to 'include')
-rw-r--r--include/net/ieee80211.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index b93fd8c..cde2f4f 100644
--- 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)
OpenPOWER on IntegriCloud