vlan: kill vlan_put_tag helper
Since both tx and rx paths work with skb->vlan_tci, there's no need for this function anymore. Switch users directly to __vlan_hwaccel_put_tag. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Šī revīzija ir iekļauta:

revīziju iesūtīja
David S. Miller

vecāks
b960a0ac69
revīzija
b4bef1b575
@@ -475,12 +475,8 @@ static void rlb_update_client(struct rlb_client_info *client_info)
|
||||
skb->dev = client_info->slave->dev;
|
||||
|
||||
if (client_info->vlan_id) {
|
||||
skb = vlan_put_tag(skb, htons(ETH_P_8021Q), client_info->vlan_id);
|
||||
if (!skb) {
|
||||
netdev_err(client_info->slave->bond->dev,
|
||||
"failed to insert VLAN tag\n");
|
||||
continue;
|
||||
}
|
||||
__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
|
||||
client_info->vlan_id);
|
||||
}
|
||||
|
||||
arp_xmit(skb);
|
||||
@@ -951,13 +947,8 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[],
|
||||
skb->priority = TC_PRIO_CONTROL;
|
||||
skb->dev = slave->dev;
|
||||
|
||||
if (vid) {
|
||||
skb = vlan_put_tag(skb, vlan_proto, vid);
|
||||
if (!skb) {
|
||||
netdev_err(slave->bond->dev, "failed to insert VLAN tag\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (vid)
|
||||
__vlan_hwaccel_put_tag(skb, vlan_proto, vid);
|
||||
|
||||
dev_queue_xmit(skb);
|
||||
}
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user