diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-14 15:29:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-14 15:29:17 -0400 |
| commit | a8519de4a030d130e0d18147a2af3112b7951e0b (patch) | |
| tree | 59f89418cf7f311d896c38ff774398e052b709d8 /net/mac80211/mesh_plink.c | |
| parent | 5c16807d3d196203d2d3c9fae51ac7e422091904 (diff) | |
| parent | 560ad81b6c90e0fddc4d6c280f16ddf18d47eeb1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/mesh_plink.c')
| -rw-r--r-- | net/mac80211/mesh_plink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index cb14253587f1..ffcbad75e09b 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c | |||
| @@ -409,7 +409,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m | |||
| 409 | baselen = (u8 *) mgmt->u.action.u.plink_action.variable - (u8 *) mgmt; | 409 | baselen = (u8 *) mgmt->u.action.u.plink_action.variable - (u8 *) mgmt; |
| 410 | if (mgmt->u.action.u.plink_action.action_code == PLINK_CONFIRM) { | 410 | if (mgmt->u.action.u.plink_action.action_code == PLINK_CONFIRM) { |
| 411 | baseaddr += 4; | 411 | baseaddr += 4; |
| 412 | baselen -= 4; | 412 | baselen += 4; |
| 413 | } | 413 | } |
| 414 | ieee802_11_parse_elems(baseaddr, len - baselen, &elems); | 414 | ieee802_11_parse_elems(baseaddr, len - baselen, &elems); |
| 415 | if (!elems.peer_link) { | 415 | if (!elems.peer_link) { |