Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

vlan/macvlan: propagate transmission state to upper layers

Browse Source 
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: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2009-11-10 06:14:24 +00:00 committed by David S. Miller
parent 572a9d7b6f
commit cbbef5e183
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/macvlan.c
View File

@ -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,

4
net/8021q/vlan_dev.c
View File

@ -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,
} 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)