diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-10 17:41:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-10 17:41:54 +0100 |
| commit | c18ab0bac4c377b22e03f9cd4efafa1316b76552 (patch) | |
| tree | 57049641755e7e01d6da9a902ac662a28b688b0b /net/mac802154/wpan.c | |
| parent | ALSA: hda - Add support of new codec ALC284 (diff) | |
| parent | Merge remote-tracking branch 'asoc/fix/wm5100' into tmp (diff) | |
| download | linux-c18ab0bac4c377b22e03f9cd4efafa1316b76552.tar.xz linux-c18ab0bac4c377b22e03f9cd4efafa1316b76552.zip | |
Merge tag 'asoc-fix-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.8
Nothing terribly exciting here except for the DOUBLE_RANGE fix which
just hadn't worked before, nobody noticed due to lack of use.
Diffstat (limited to 'net/mac802154/wpan.c')
| -rw-r--r-- | net/mac802154/wpan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c index 1191039c2b1b..199b92261e94 100644 --- a/net/mac802154/wpan.c +++ b/net/mac802154/wpan.c @@ -389,7 +389,7 @@ void mac802154_wpan_setup(struct net_device *dev) static int mac802154_process_data(struct net_device *dev, struct sk_buff *skb) { - return netif_rx(skb); + return netif_rx_ni(skb); } static int |