hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/net/8021q/vlan_dev.c
....@@ -108,8 +108,8 @@
108108 * NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING
109109 * OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...
110110 */
111
- if (veth->h_vlan_proto != vlan->vlan_proto ||
112
- vlan->flags & VLAN_FLAG_REORDER_HDR) {
111
+ if (vlan->flags & VLAN_FLAG_REORDER_HDR ||
112
+ veth->h_vlan_proto != vlan->vlan_proto) {
113113 u16 vlan_tci;
114114 vlan_tci = vlan->vlan_id;
115115 vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb->priority);
....@@ -365,7 +365,7 @@
365365
366366 switch (cmd) {
367367 case SIOCSHWTSTAMP:
368
- if (!net_eq(dev_net(dev), &init_net))
368
+ if (!net_eq(dev_net(dev), dev_net(real_dev)))
369369 break;
370370 fallthrough;
371371 case SIOCGMIIPHY: