Commit cbbef5e1 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller

vlan/macvlan: propagate transmission state to upper layers

Both vlan and macvlan devices usually don't use a qdisc and immediately
queue packets to the underlying device. Propagate transmission state of
the underlying device to the upper layers so they can react on congestion
and/or inform the sending process.
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 572a9d7b
...@@ -202,7 +202,7 @@ static netdev_tx_t macvlan_start_xmit(struct sk_buff *skb, ...@@ -202,7 +202,7 @@ static netdev_tx_t macvlan_start_xmit(struct sk_buff *skb,
} else } else
txq->tx_dropped++; txq->tx_dropped++;
return NETDEV_TX_OK; return ret;
} }
static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev, static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev,
......
...@@ -332,7 +332,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, ...@@ -332,7 +332,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
} else } else
txq->tx_dropped++; txq->tx_dropped++;
return NETDEV_TX_OK; return ret;
} }
static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
...@@ -358,7 +358,7 @@ static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, ...@@ -358,7 +358,7 @@ static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
} else } else
txq->tx_dropped++; txq->tx_dropped++;
return NETDEV_TX_OK; return ret;
} }
static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu) static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment