diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-29 13:46:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-29 13:46:24 -0700 |
| commit | 1bddc59c2546a24a92b1e7d4d8fa1e1e38aeedb2 (patch) | |
| tree | 09f07fe50e45aeb6a61c67c83cb714a5eca545d7 /net/wireless/util.c | |
| parent | 4f16061ede08b6bea34c4e699c9dfa7ba6c88793 (diff) | |
| parent | ba6e5eb107b4b26444cb67ce6fb8eb0973a97964 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
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, if (elen >= sizeof(struct ieee80211_meshconf_ie)) elems->mesh_config = (void *)pos; break; - case WLAN_EID_PEER_LINK: - elems->peer_link = pos; - elems->peer_link_len = elen; + case WLAN_EID_PEER_MGMT: + elems->peering = pos; + elems->peering_len = elen; break; case WLAN_EID_PREQ: elems->preq = pos; |