Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e3c8866 authored by Thomas Pedersen's avatar Thomas Pedersen Committed by John W. Linville
Browse files

mac80211: failed forwarded mesh frame addressing 



Don't write the TA until next hop is actually known, since we might need
the original TA for sending a PERR. Previously we would send a PERR to
ourself if path resolution for a forwarded frame failed.

Signed-off-by: default avatarThomas Pedersen <thomas@cozybit.com>
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4bb62344

net/mac80211/mesh_hwmp.c

+3 −2
Original line number Diff line number Diff line
@@ -1029,9 +1029,10 @@ int mesh_nexthop_lookup(struct sk_buff *skb, 
					PREQ_Q_F_START | PREQ_Q_F_REFRESH);

		}

		next_hop = rcu_dereference(mpath->next_hop);

		if (next_hop)

		if (next_hop) {

			memcpy(hdr->addr1, next_hop->sta.addr, ETH_ALEN);

		else

			memcpy(hdr->addr2, sdata->vif.addr, ETH_ALEN);

		} else

			err = -ENOENT;

	} else {

		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

net/mac80211/mesh_pathtbl.c

+4 −2
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta) 
	while ((skb = __skb_dequeue(&mpath->frame_queue)) != NULL) {

		hdr = (struct ieee80211_hdr *) skb->data;

		memcpy(hdr->addr1, sta->sta.addr, ETH_ALEN);

		memcpy(hdr->addr2, mpath->sdata->vif.addr, ETH_ALEN);

		__skb_queue_tail(&tmpq, skb);

	}
@@ -264,6 +265,7 @@ static void prepare_for_gate(struct sk_buff *skb, char *dst_addr, 
	next_hop = rcu_dereference(gate_mpath->next_hop)->sta.addr;

	memcpy(hdr->addr1, next_hop, ETH_ALEN);

	rcu_read_unlock();

	memcpy(hdr->addr2, gate_mpath->sdata->vif.addr, ETH_ALEN);

	memcpy(hdr->addr3, dst_addr, ETH_ALEN);

}
@@ -990,7 +992,7 @@ void mesh_path_discard_frame(struct sk_buff *skb, 
		u8 *ra, *da;



		da = hdr->addr3;

		ra = hdr->addr1;

		ra = hdr->addr2;

		rcu_read_lock();

		mpath = mesh_path_lookup(da, sdata);

		if (mpath) {
@@ -999,7 +1001,7 @@ void mesh_path_discard_frame(struct sk_buff *skb, 
			spin_unlock_bh(&mpath->state_lock);

		}

		rcu_read_unlock();

		mesh_path_error_tx(sdata->u.mesh.mshcfg.element_ttl, skb->data,

		mesh_path_error_tx(sdata->u.mesh.mshcfg.element_ttl, da,

				   cpu_to_le32(sn), reason, ra, sdata);

	}

net/mac80211/rx.c

+1 −7
Original line number Diff line number Diff line
@@ -1974,7 +1974,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 
				goto out;



			fwd_hdr =  (struct ieee80211_hdr *) fwd_skb->data;

			memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN);

			info = IEEE80211_SKB_CB(fwd_skb);

			memset(info, 0, sizeof(*info));

			info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
@@ -1983,14 +1982,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) 
			if (is_multicast_ether_addr(fwd_hdr->addr1)) {

				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,

								fwded_mcast);

				memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN);

			} else {

				int err;

				/*

				 * Save TA to addr1 to send TA a path error if a

				 * suitable next hop is not found

				 */

				memcpy(fwd_hdr->addr1, fwd_hdr->addr2,

						ETH_ALEN);

				err = mesh_nexthop_lookup(fwd_skb, sdata);

				/* Failed to immediately resolve next hop:

				 * fwded frame was dropped or will be added