|
@@ -73,6 +73,8 @@ vlan_dev_get_egress_qos_mask(struct net_device *dev, struct sk_buff *skb)
|
|
|
{
|
|
|
struct vlan_priority_tci_mapping *mp;
|
|
|
|
|
|
+ smp_rmb(); /* coupled with smp_wmb() in vlan_dev_set_egress_priority() */
|
|
|
+
|
|
|
mp = vlan_dev_priv(dev)->egress_priority_map[(skb->priority & 0xF)];
|
|
|
while (mp) {
|
|
|
if (mp->priority == skb->priority) {
|
|
@@ -249,6 +251,11 @@ int vlan_dev_set_egress_priority(const struct net_device *dev,
|
|
|
np->next = mp;
|
|
|
np->priority = skb_prio;
|
|
|
np->vlan_qos = vlan_qos;
|
|
|
+ /* Before inserting this element in hash table, make sure all its fields
|
|
|
+ * are committed to memory.
|
|
|
+ * coupled with smp_rmb() in vlan_dev_get_egress_qos_mask()
|
|
|
+ */
|
|
|
+ smp_wmb();
|
|
|
vlan->egress_priority_map[skb_prio & 0xF] = np;
|
|
|
if (vlan_qos)
|
|
|
vlan->nr_egress_mappings++;
|