diff --git a/[refs] b/[refs] index 470343a74d9c..9f4f6e32d83c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db2b620aa03d1301398dcba8b1097686bd82e65b +refs/heads/master: 5ff3fec6d3fc848753c2fa30b18607358f89a202 diff --git a/trunk/net/mac802154/wpan.c b/trunk/net/mac802154/wpan.c index 1191039c2b1b..199b92261e94 100644 --- a/trunk/net/mac802154/wpan.c +++ b/trunk/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