Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7573eac762af253e0b61b60cce34ab80f2dd45c7

Authored by John W. Linville
2 parents a6d27d2ac8 4efe7f51be
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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Showing 1 changed file Side-by-side Diff

net/mac80211/status.c
Diff comments   View file @ 7573eac
... ... @@ -377,7 +377,7 @@
377 377 skb2 = skb_clone(skb, GFP_ATOMIC);
378 378 if (skb2) {
379 379 skb2->dev = prev_dev;
380   - netif_receive_skb(skb2);
  380 + netif_rx(skb2);
381 381 }
382 382 }
383 383  
... ... @@ -386,7 +386,7 @@
386 386 }
387 387 if (prev_dev) {
388 388 skb->dev = prev_dev;
389   - netif_receive_skb(skb);
  389 + netif_rx(skb);
390 390 skb = NULL;
391 391 }
392 392 rcu_read_unlock();