diff options
Diffstat (limited to 'drivers/net/igbvf')
-rw-r--r-- | drivers/net/igbvf/netdev.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index 3f03c42ece97..dadb78229ad5 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c | |||
@@ -2204,9 +2204,9 @@ static inline void igbvf_tx_queue_adv(struct igbvf_adapter *adapter, | |||
2204 | mmiowb(); | 2204 | mmiowb(); |
2205 | } | 2205 | } |
2206 | 2206 | ||
2207 | static int igbvf_xmit_frame_ring_adv(struct sk_buff *skb, | 2207 | static netdev_tx_t igbvf_xmit_frame_ring_adv(struct sk_buff *skb, |
2208 | struct net_device *netdev, | 2208 | struct net_device *netdev, |
2209 | struct igbvf_ring *tx_ring) | 2209 | struct igbvf_ring *tx_ring) |
2210 | { | 2210 | { |
2211 | struct igbvf_adapter *adapter = netdev_priv(netdev); | 2211 | struct igbvf_adapter *adapter = netdev_priv(netdev); |
2212 | unsigned int first, tx_flags = 0; | 2212 | unsigned int first, tx_flags = 0; |
@@ -2279,11 +2279,11 @@ static int igbvf_xmit_frame_ring_adv(struct sk_buff *skb, | |||
2279 | return NETDEV_TX_OK; | 2279 | return NETDEV_TX_OK; |
2280 | } | 2280 | } |
2281 | 2281 | ||
2282 | static int igbvf_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | 2282 | static netdev_tx_t igbvf_xmit_frame(struct sk_buff *skb, |
2283 | struct net_device *netdev) | ||
2283 | { | 2284 | { |
2284 | struct igbvf_adapter *adapter = netdev_priv(netdev); | 2285 | struct igbvf_adapter *adapter = netdev_priv(netdev); |
2285 | struct igbvf_ring *tx_ring; | 2286 | struct igbvf_ring *tx_ring; |
2286 | int retval; | ||
2287 | 2287 | ||
2288 | if (test_bit(__IGBVF_DOWN, &adapter->state)) { | 2288 | if (test_bit(__IGBVF_DOWN, &adapter->state)) { |
2289 | dev_kfree_skb_any(skb); | 2289 | dev_kfree_skb_any(skb); |
@@ -2292,9 +2292,7 @@ static int igbvf_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
2292 | 2292 | ||
2293 | tx_ring = &adapter->tx_ring[0]; | 2293 | tx_ring = &adapter->tx_ring[0]; |
2294 | 2294 | ||
2295 | retval = igbvf_xmit_frame_ring_adv(skb, netdev, tx_ring); | 2295 | return igbvf_xmit_frame_ring_adv(skb, netdev, tx_ring); |
2296 | |||
2297 | return retval; | ||
2298 | } | 2296 | } |
2299 | 2297 | ||
2300 | /** | 2298 | /** |