Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[firefly-linux-kernel-4.4.55.git] / net / llc / llc_output.c

diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c
index b658cba89fdd6fe97ded4b79d7fd9ae30459182d..2dae8a5df23fe56f93620dcaf313a54d6e41b231 100644 (file)
--- a/net/llc/llc_output.c
+++ b/net/llc/llc_output.c
@@ -14,9 +14,7 @@
  */
 
 #include <linux/if_arp.h>
-#include <linux/if_tr.h>
 #include <linux/netdevice.h>
-#include <linux/trdevice.h>
 #include <linux/skbuff.h>
 #include <linux/export.h>
 #include <net/llc.h>
@@ -37,7 +35,6 @@ int llc_mac_hdr_init(struct sk_buff *skb,
        int rc = -EINVAL;
 
        switch (skb->dev->type) {
-       case ARPHRD_IEEE802_TR:
        case ARPHRD_ETHER:
        case ARPHRD_LOOPBACK:
                rc = dev_hard_header(skb, skb->dev, ETH_P_802_2, da, sa,