.. | .. |
---|
108 | 108 | * NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING |
---|
109 | 109 | * OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs... |
---|
110 | 110 | */ |
---|
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) { |
---|
113 | 113 | u16 vlan_tci; |
---|
114 | 114 | vlan_tci = vlan->vlan_id; |
---|
115 | 115 | vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb->priority); |
---|
.. | .. |
---|
365 | 365 | |
---|
366 | 366 | switch (cmd) { |
---|
367 | 367 | case SIOCSHWTSTAMP: |
---|
368 | | - if (!net_eq(dev_net(dev), &init_net)) |
---|
| 368 | + if (!net_eq(dev_net(dev), dev_net(real_dev))) |
---|
369 | 369 | break; |
---|
370 | 370 | fallthrough; |
---|
371 | 371 | case SIOCGMIIPHY: |
---|