aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh_pathtbl.c
diff options
context:
space:
mode:
authorRui Paulo <rpaulo@gmail.com>2009-11-09 18:46:55 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-13 17:43:56 -0500
commitd19b3bf6384e66ac6e11a61ee31ed2cfe149f4d8 (patch)
tree2ec825639458dafddecc7e3d0f83afff9cff0cfa /net/mac80211/mesh_pathtbl.c
parentbe125c60e46e165fbfe33db36a4a9d943d560a5b (diff)
mac80211: replace "destination" with "target" to follow the spec
Resulting object files have the same MD5 as before. Signed-off-by: Rui Paulo <rpaulo@gmail.com> Signed-off-by: Javier Cardona <javier@cozybit.com> Reviewed-by: Andrey Yurovsky <andrey@cozybit.com> Tested-by: Brian Cavagnolo <brian@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mesh_pathtbl.c')
-rw-r--r--net/mac80211/mesh_pathtbl.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 5d541235ca2f..2cebdf52b7bc 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -463,10 +463,10 @@ void mesh_plink_broken(struct sta_info *sta)
463 mpath->flags & MESH_PATH_ACTIVE && 463 mpath->flags & MESH_PATH_ACTIVE &&
464 !(mpath->flags & MESH_PATH_FIXED)) { 464 !(mpath->flags & MESH_PATH_FIXED)) {
465 mpath->flags &= ~MESH_PATH_ACTIVE; 465 mpath->flags &= ~MESH_PATH_ACTIVE;
466 ++mpath->dsn; 466 ++mpath->sn;
467 spin_unlock_bh(&mpath->state_lock); 467 spin_unlock_bh(&mpath->state_lock);
468 mesh_path_error_tx(MESH_TTL, mpath->dst, 468 mesh_path_error_tx(MESH_TTL, mpath->dst,
469 cpu_to_le32(mpath->dsn), 469 cpu_to_le32(mpath->sn),
470 PERR_RCODE_DEST_UNREACH, 470 PERR_RCODE_DEST_UNREACH,
471 sdata->dev->broadcast, sdata); 471 sdata->dev->broadcast, sdata);
472 } else 472 } else
@@ -602,7 +602,7 @@ void mesh_path_discard_frame(struct sk_buff *skb,
602{ 602{
603 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; 603 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
604 struct mesh_path *mpath; 604 struct mesh_path *mpath;
605 u32 dsn = 0; 605 u32 sn = 0;
606 606
607 if (memcmp(hdr->addr4, sdata->dev->dev_addr, ETH_ALEN) != 0) { 607 if (memcmp(hdr->addr4, sdata->dev->dev_addr, ETH_ALEN) != 0) {
608 u8 *ra, *da; 608 u8 *ra, *da;
@@ -611,8 +611,8 @@ void mesh_path_discard_frame(struct sk_buff *skb,
611 ra = hdr->addr1; 611 ra = hdr->addr1;
612 mpath = mesh_path_lookup(da, sdata); 612 mpath = mesh_path_lookup(da, sdata);
613 if (mpath) 613 if (mpath)
614 dsn = ++mpath->dsn; 614 sn = ++mpath->sn;
615 mesh_path_error_tx(MESH_TTL, skb->data, cpu_to_le32(dsn), 615 mesh_path_error_tx(MESH_TTL, skb->data, cpu_to_le32(sn),
616 PERR_RCODE_NO_ROUTE, ra, sdata); 616 PERR_RCODE_NO_ROUTE, ra, sdata);
617 } 617 }
618 618
@@ -648,7 +648,7 @@ void mesh_path_fix_nexthop(struct mesh_path *mpath, struct sta_info *next_hop)
648{ 648{
649 spin_lock_bh(&mpath->state_lock); 649 spin_lock_bh(&mpath->state_lock);
650 mesh_path_assign_nexthop(mpath, next_hop); 650 mesh_path_assign_nexthop(mpath, next_hop);
651 mpath->dsn = 0xffff; 651 mpath->sn = 0xffff;
652 mpath->metric = 0; 652 mpath->metric = 0;
653 mpath->hop_count = 0; 653 mpath->hop_count = 0;
654 mpath->exp_time = 0; 654 mpath->exp_time = 0;