Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / mac80211 / mesh_pathtbl.c

diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 349e466cf08b06825a45d5923dae2c167fa0d82f..8d65b47d9837582cfa5cce46e59b4bc401a28025 100644 (file)
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -467,8 +467,8 @@ void mesh_plink_broken(struct sta_info *sta)
                        mpath->flags &= ~MESH_PATH_ACTIVE;
                        ++mpath->sn;
                        spin_unlock_bh(&mpath->state_lock);
-                       mesh_path_error_tx(MESH_TTL, mpath->dst,
-                                       cpu_to_le32(mpath->sn),
+                       mesh_path_error_tx(sdata->u.mesh.mshcfg.element_ttl,
+                                       mpath->dst, cpu_to_le32(mpath->sn),
                                        cpu_to_le16(PERR_RCODE_DEST_UNREACH),
                                        bcast, sdata);
                } else
@@ -614,7 +614,8 @@ void mesh_path_discard_frame(struct sk_buff *skb,
                mpath = mesh_path_lookup(da, sdata);
                if (mpath)
                        sn = ++mpath->sn;
-               mesh_path_error_tx(MESH_TTL, skb->data, cpu_to_le32(sn),
+               mesh_path_error_tx(sdata->u.mesh.mshcfg.element_ttl, skb->data,
+                                  cpu_to_le32(sn),
                                   cpu_to_le16(PERR_RCODE_NO_ROUTE), ra, sdata);
        }