diff options
Diffstat (limited to 'net/mac80211/mesh_hwmp.c')
-rw-r--r-- | net/mac80211/mesh_hwmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index 8e86e910edfc..e93c37ef6a48 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c | |||
@@ -784,7 +784,6 @@ int mesh_nexthop_lookup(struct sk_buff *skb, | |||
784 | mesh_path_add(dst_addr, sdata); | 784 | mesh_path_add(dst_addr, sdata); |
785 | mpath = mesh_path_lookup(dst_addr, sdata); | 785 | mpath = mesh_path_lookup(dst_addr, sdata); |
786 | if (!mpath) { | 786 | if (!mpath) { |
787 | dev_kfree_skb(skb); | ||
788 | sdata->u.mesh.mshstats.dropped_frames_no_route++; | 787 | sdata->u.mesh.mshstats.dropped_frames_no_route++; |
789 | err = -ENOSPC; | 788 | err = -ENOSPC; |
790 | goto endlookup; | 789 | goto endlookup; |
@@ -804,6 +803,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb, | |||
804 | memcpy(hdr->addr1, mpath->next_hop->sta.addr, | 803 | memcpy(hdr->addr1, mpath->next_hop->sta.addr, |
805 | ETH_ALEN); | 804 | ETH_ALEN); |
806 | } else { | 805 | } else { |
806 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | ||
807 | if (!(mpath->flags & MESH_PATH_RESOLVING)) { | 807 | if (!(mpath->flags & MESH_PATH_RESOLVING)) { |
808 | /* Start discovery only if it is not running yet */ | 808 | /* Start discovery only if it is not running yet */ |
809 | mesh_queue_preq(mpath, PREQ_Q_F_START); | 809 | mesh_queue_preq(mpath, PREQ_Q_F_START); |
@@ -815,6 +815,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb, | |||
815 | skb_unlink(skb_to_free, &mpath->frame_queue); | 815 | skb_unlink(skb_to_free, &mpath->frame_queue); |
816 | } | 816 | } |
817 | 817 | ||
818 | info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING; | ||
818 | skb_queue_tail(&mpath->frame_queue, skb); | 819 | skb_queue_tail(&mpath->frame_queue, skb); |
819 | if (skb_to_free) | 820 | if (skb_to_free) |
820 | mesh_path_discard_frame(skb_to_free, sdata); | 821 | mesh_path_discard_frame(skb_to_free, sdata); |