diff options
-rw-r--r-- | net/mac80211/mesh_pathtbl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 02f8709a181e..479597e88583 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c | |||
@@ -494,8 +494,10 @@ void mesh_path_tx_pending(struct mesh_path *mpath) | |||
494 | * @skb: frame to discard | 494 | * @skb: frame to discard |
495 | * @sdata: network subif the frame was to be sent through | 495 | * @sdata: network subif the frame was to be sent through |
496 | * | 496 | * |
497 | * If the frame was beign forwarded from another MP, a PERR frame will be sent | 497 | * If the frame was being forwarded from another MP, a PERR frame will be sent |
498 | * to the precursor. | 498 | * to the precursor. The precursor's address (i.e. the previous hop) was saved |
499 | * in addr1 of the frame-to-be-forwarded, and would only be overwritten once | ||
500 | * the destination is successfully resolved. | ||
499 | * | 501 | * |
500 | * Locking: the function must me called within a rcu_read_lock region | 502 | * Locking: the function must me called within a rcu_read_lock region |
501 | */ | 503 | */ |
@@ -510,7 +512,7 @@ void mesh_path_discard_frame(struct sk_buff *skb, | |||
510 | u8 *ra, *da; | 512 | u8 *ra, *da; |
511 | 513 | ||
512 | da = hdr->addr3; | 514 | da = hdr->addr3; |
513 | ra = hdr->addr2; | 515 | ra = hdr->addr1; |
514 | mpath = mesh_path_lookup(da, sdata); | 516 | mpath = mesh_path_lookup(da, sdata); |
515 | if (mpath) | 517 | if (mpath) |
516 | dsn = ++mpath->dsn; | 518 | dsn = ++mpath->dsn; |