[TR]: Make tr_type_trans set skb->dev

[firefly-linux-kernel-4.4.55.git] / net / atm / lec.c

diff --git a/net/atm/lec.c b/net/atm/lec.c
index 986945527691204684958cbc7c06ee8dff886ee1..e5ed878c8825225da1e67bb4d360268c272e788b 100644 (file)
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -825,14 +825,16 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb)
                if (!hlist_empty(&priv->lec_arp_empty_ones)) {
                        lec_arp_check_empties(priv, vcc, skb);
                }
-               skb->dev = dev;
                skb_pull(skb, 2);       /* skip lec_id */
 #ifdef CONFIG_TR
                if (priv->is_trdev)
                        skb->protocol = tr_type_trans(skb, dev);
                else
 #endif
+               {
+                       skb->dev = dev;
                        skb->protocol = eth_type_trans(skb, dev);
+               }
                priv->stats.rx_packets++;
                priv->stats.rx_bytes += skb->len;
                memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data));
@@ -1437,7 +1439,6 @@ static void lane2_associate_ind(struct net_device *dev, u8 *mac_addr,
  */
 
 #include <linux/types.h>
-#include <linux/sched.h>
 #include <linux/timer.h>
 #include <asm/param.h>
 #include <asm/atomic.h>