diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 15:23:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 15:23:07 -0500 |
| commit | e67b23c71cb9ee02d65a74c3858716ba2dedd554 (patch) | |
| tree | 17cfeadd37b93ca758aa3ffb61e02edf62289aea /include/net/ieee80211.h | |
| parent | d4bf205305a9188894ac4e2e9875e42f9f8eabfd (diff) | |
| parent | f7492f17f2123f0f4db5f9e8ba89867a7b352658 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/net/ieee80211.h')
| -rw-r--r-- | include/net/ieee80211.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index b93fd8c1d884..cde2f4f4f501 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) | |||
| 1042 | case IEEE80211_4ADDR_LEN: | 1042 | case IEEE80211_4ADDR_LEN: |
| 1043 | return ((struct ieee80211_hdr_4addr *)hdr)->payload; | 1043 | return ((struct ieee80211_hdr_4addr *)hdr)->payload; |
| 1044 | } | 1044 | } |
| 1045 | 1045 | return NULL; | |
| 1046 | } | 1046 | } |
| 1047 | 1047 | ||
| 1048 | static inline int ieee80211_is_ofdm_rate(u8 rate) | 1048 | static inline int ieee80211_is_ofdm_rate(u8 rate) |