Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fe58343461def0d376908a80cebd087b746a1483

Authored by Javier Cardona
Committed by John W. Linville
1 parent a3e14f3d2a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mac80211: Improve dequeing from mpath frame queue. 

Also, fix typo in comment.

Signed-off-by: Javier Cardona <javier@cozybit.com>
Tested-by: Andrey Yurovsky <andrey@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 2 changed files with 3 additions and 5 deletions Side-by-side Diff

... ... @@ -61,7 +61,7 @@
61 61 * retry
62 62 * @discovery_retries: number of discovery retries
63 63 * @flags: mesh path flags, as specified on &enum mesh_path_flags
64   - * @state_lock: mesh pat state lock
  64 + * @state_lock: mesh path state lock
65 65 *
66 66 *
67 67 * The combination of dst and sdata is unique in the mesh path table. Since the
net/mac80211/mesh_hwmp.c
Diff comments   View file @ fe58343
... ... @@ -810,10 +810,8 @@
810 810 }
811 811  
812 812 if (skb_queue_len(&mpath->frame_queue) >=
813   - MESH_FRAME_QUEUE_LEN) {
814   - skb_to_free = mpath->frame_queue.next;
815   - skb_unlink(skb_to_free, &mpath->frame_queue);
816   - }
  813 + MESH_FRAME_QUEUE_LEN)
  814 + skb_to_free = skb_dequeue(&mpath->frame_queue);
817 815  
818 816 info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
819 817 skb_queue_tail(&mpath->frame_queue, skb);