--- zzzz-none-000/linux-4.1.38/include/linux/if_vlan.h 2017-01-18 18:48:06.000000000 +0000 +++ bcm63-7582-715/linux-4.1.38/include/linux/if_vlan.h 2020-11-25 10:06:48.000000000 +0000 @@ -159,6 +159,15 @@ #ifdef CONFIG_NET_POLL_CONTROLLER struct netpoll *netpoll; #endif + +#if defined(CONFIG_BCM_KF_BLOG) && defined(CONFIG_BLOG) + BlogStats_t bstats; /* stats when the blog promiscuous layer has consumed packets */ + struct net_device_stats cstats; /* Cummulative Device stats (rx-bytes, tx-pkts, etc...) */ +#endif + +#if defined(CONFIG_BCM_KF_VLAN) && (defined(CONFIG_BCM_VLAN) || defined(CONFIG_BCM_VLAN_MODULE)) + int nfmark_to_priority; +#endif unsigned int nest_level; }; @@ -334,6 +343,11 @@ { int err; +#if defined(CONFIG_BCM_KF_NBUFF) +#if defined(CONFIG_BCM_KF_VLAN) && (defined(CONFIG_BCM_VLAN) || defined(CONFIG_BCM_VLAN_MODULE)) + vlan_tci |= skb->cfi_save; +#endif +#endif err = __vlan_insert_tag(skb, vlan_proto, vlan_tci); if (err) { dev_kfree_skb_any(skb);