Commit fe583434 authored by Javier Cardona's avatar Javier Cardona Committed by John W. Linville

mac80211: Improve dequeing from mpath frame queue.

Also, fix typo in comment.
Signed-off-by: default avatarJavier Cardona <javier@cozybit.com>
Tested-by: default avatarAndrey Yurovsky <andrey@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a3e14f3d
...@@ -61,7 +61,7 @@ enum mesh_path_flags { ...@@ -61,7 +61,7 @@ enum mesh_path_flags {
* retry * retry
* @discovery_retries: number of discovery retries * @discovery_retries: number of discovery retries
* @flags: mesh path flags, as specified on &enum mesh_path_flags * @flags: mesh path flags, as specified on &enum mesh_path_flags
* @state_lock: mesh pat state lock * @state_lock: mesh path state lock
* *
* *
* The combination of dst and sdata is unique in the mesh path table. Since the * The combination of dst and sdata is unique in the mesh path table. Since the
......
...@@ -810,10 +810,8 @@ int mesh_nexthop_lookup(struct sk_buff *skb, ...@@ -810,10 +810,8 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
} }
if (skb_queue_len(&mpath->frame_queue) >= if (skb_queue_len(&mpath->frame_queue) >=
MESH_FRAME_QUEUE_LEN) { MESH_FRAME_QUEUE_LEN)
skb_to_free = mpath->frame_queue.next; skb_to_free = skb_dequeue(&mpath->frame_queue);
skb_unlink(skb_to_free, &mpath->frame_queue);
}
info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING; info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
skb_queue_tail(&mpath->frame_queue, skb); skb_queue_tail(&mpath->frame_queue, skb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment