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

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

net/mac80211/mesh.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ enum mesh_path_flags { 
 * 	retry

 * @discovery_retries: number of discovery retries

 * @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

net/mac80211/mesh_hwmp.c

+2 −4
Original line number Diff line number Diff line
@@ -810,10 +810,8 @@ int mesh_nexthop_lookup(struct sk_buff *skb, 
		}



		if (skb_queue_len(&mpath->frame_queue) >=

				MESH_FRAME_QUEUE_LEN) {

			skb_to_free = mpath->frame_queue.next;

			skb_unlink(skb_to_free, &mpath->frame_queue);

		}

				MESH_FRAME_QUEUE_LEN)

			skb_to_free = skb_dequeue(&mpath->frame_queue);



		info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;

		skb_queue_tail(&mpath->frame_queue, skb);