diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:07 -0400 |
| commit | 6fef4c0c8eeff7de13007a5f56113475444a253d (patch) | |
| tree | 216bafb88ab84c5e0a048598cd6c05f7eb8f438d /net/8021q | |
| parent | dc1f8bf68b311b1537cb65893430b6796118498a (diff) | |
netdev: convert pseudo-devices to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 6e695acd1ae0..84a2be43185f 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
| @@ -288,7 +288,8 @@ static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, | |||
| 288 | return rc; | 288 | return rc; |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | 291 | static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, |
| 292 | struct net_device *dev) | ||
| 292 | { | 293 | { |
| 293 | struct netdev_queue *txq = netdev_get_tx_queue(dev, 0); | 294 | struct netdev_queue *txq = netdev_get_tx_queue(dev, 0); |
| 294 | struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); | 295 | struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); |
| @@ -325,8 +326,8 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 325 | return NETDEV_TX_OK; | 326 | return NETDEV_TX_OK; |
| 326 | } | 327 | } |
| 327 | 328 | ||
| 328 | static int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, | 329 | static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, |
| 329 | struct net_device *dev) | 330 | struct net_device *dev) |
| 330 | { | 331 | { |
| 331 | struct netdev_queue *txq = netdev_get_tx_queue(dev, 0); | 332 | struct netdev_queue *txq = netdev_get_tx_queue(dev, 0); |
| 332 | u16 vlan_tci; | 333 | u16 vlan_tci; |