diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-08-29 14:52:20 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 14:52:20 -0400 |
| commit | ba6e5eb107b4b26444cb67ce6fb8eb0973a97964 (patch) | |
| tree | 9377baf652e0cd8360372020b0386e238d07a30d /net/wireless/util.c | |
| parent | f3116f62cb56ef5efd172371fab688bb27529f69 (diff) | |
| parent | a508a6ea234571e0e7d1e9f2455fc1eca54d1fef (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 844ddb0aa653..eef82f79554d 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c | |||
| @@ -1158,9 +1158,9 @@ u32 ieee802_11_parse_elems_crc(u8 *start, size_t len, | |||
| 1158 | if (elen >= sizeof(struct ieee80211_meshconf_ie)) | 1158 | if (elen >= sizeof(struct ieee80211_meshconf_ie)) |
| 1159 | elems->mesh_config = (void *)pos; | 1159 | elems->mesh_config = (void *)pos; |
| 1160 | break; | 1160 | break; |
| 1161 | case WLAN_EID_PEER_LINK: | 1161 | case WLAN_EID_PEER_MGMT: |
| 1162 | elems->peer_link = pos; | 1162 | elems->peering = pos; |
| 1163 | elems->peer_link_len = elen; | 1163 | elems->peering_len = elen; |
| 1164 | break; | 1164 | break; |
| 1165 | case WLAN_EID_PREQ: | 1165 | case WLAN_EID_PREQ: |
| 1166 | elems->preq = pos; | 1166 | elems->preq = pos; |