OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b38de31
)
mac80211: refactor skb copy to failq in mesh_path_move_to_queue
author
John W. Linville
<linville@tuxdriver.com>
Wed, 24 Aug 2011 19:12:41 +0000
(15:12 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Mon, 29 Aug 2011 19:25:28 +0000
(15:25 -0400)
This seems a bit less awkward...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/mesh_pathtbl.c
patch
|
blob
|
history
diff --git
a/net/mac80211/mesh_pathtbl.c
b/net/mac80211/mesh_pathtbl.c
index
3c2bcb2
..
ede4f52
100644
(file)
--- a/
net/mac80211/mesh_pathtbl.c
+++ b/
net/mac80211/mesh_pathtbl.c
@@
-307,14
+307,14
@@
static void mesh_path_move_to_queue(struct mesh_path *gate_mpath,
while (num_skbs--) {
skb = __skb_dequeue(&failq);
- if (copy)
+ if (copy)
{
cp_skb = skb_copy(skb, GFP_ATOMIC);
+ if (cp_skb)
+ __skb_queue_tail(&failq, cp_skb);
+ }
prepare_for_gate(skb, gate_mpath->dst, gate_mpath);
__skb_queue_tail(&gateq, skb);
-
- if (copy && cp_skb)
- __skb_queue_tail(&failq, cp_skb);
}
spin_lock_irqsave(&gate_mpath->frame_queue.lock, flags);