diff options
Diffstat (limited to 'net/bridge/br_vlan.c')
-rw-r--r-- | net/bridge/br_vlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index c3076e2c4294..bd58b45f5f90 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c | |||
@@ -175,7 +175,7 @@ struct sk_buff *br_handle_vlan(struct net_bridge *br, | |||
175 | * mac header. | 175 | * mac header. |
176 | */ | 176 | */ |
177 | skb_push(skb, ETH_HLEN); | 177 | skb_push(skb, ETH_HLEN); |
178 | skb = __vlan_put_tag(skb, skb->vlan_tci); | 178 | skb = __vlan_put_tag(skb, skb->vlan_proto, skb->vlan_tci); |
179 | if (!skb) | 179 | if (!skb) |
180 | goto out; | 180 | goto out; |
181 | /* put skb->data back to where it was */ | 181 | /* put skb->data back to where it was */ |
@@ -217,7 +217,7 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v, | |||
217 | /* PVID is set on this port. Any untagged ingress | 217 | /* PVID is set on this port. Any untagged ingress |
218 | * frame is considered to belong to this vlan. | 218 | * frame is considered to belong to this vlan. |
219 | */ | 219 | */ |
220 | __vlan_hwaccel_put_tag(skb, pvid); | 220 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), pvid); |
221 | return true; | 221 | return true; |
222 | } | 222 | } |
223 | 223 | ||