aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e100.c3
-rw-r--r--drivers/net/e1000/e1000_main.c6
-rw-r--r--drivers/net/e1000e/netdev.c3
-rw-r--r--drivers/net/igb/igb_main.c19
-rw-r--r--drivers/net/igbvf/netdev.c14
-rw-r--r--drivers/net/ixgb/ixgb_main.c5
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c3
7 files changed, 30 insertions, 23 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 569df19f0df5..6a3176042c47 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1690,7 +1690,8 @@ static void e100_xmit_prepare(struct nic *nic, struct cb *cb,
1690 cb->u.tcb.tbd.size = cpu_to_le16(skb->len); 1690 cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
1691} 1691}
1692 1692
1693static int e100_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 1693static netdev_tx_t e100_xmit_frame(struct sk_buff *skb,
1694 struct net_device *netdev)
1694{ 1695{
1695 struct nic *nic = netdev_priv(netdev); 1696 struct nic *nic = netdev_priv(netdev);
1696 int err; 1697 int err;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index d7df00c2dbd6..b3063e60be6e 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -125,7 +125,8 @@ static void e1000_set_rx_mode(struct net_device *netdev);
125static void e1000_update_phy_info(unsigned long data); 125static void e1000_update_phy_info(unsigned long data);
126static void e1000_watchdog(unsigned long data); 126static void e1000_watchdog(unsigned long data);
127static void e1000_82547_tx_fifo_stall(unsigned long data); 127static void e1000_82547_tx_fifo_stall(unsigned long data);
128static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev); 128static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
129 struct net_device *netdev);
129static struct net_device_stats * e1000_get_stats(struct net_device *netdev); 130static struct net_device_stats * e1000_get_stats(struct net_device *netdev);
130static int e1000_change_mtu(struct net_device *netdev, int new_mtu); 131static int e1000_change_mtu(struct net_device *netdev, int new_mtu);
131static int e1000_set_mac(struct net_device *netdev, void *p); 132static int e1000_set_mac(struct net_device *netdev, void *p);
@@ -3249,7 +3250,8 @@ static int e1000_maybe_stop_tx(struct net_device *netdev,
3249} 3250}
3250 3251
3251#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 ) 3252#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
3252static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 3253static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
3254 struct net_device *netdev)
3253{ 3255{
3254 struct e1000_adapter *adapter = netdev_priv(netdev); 3256 struct e1000_adapter *adapter = netdev_priv(netdev);
3255 struct e1000_hw *hw = &adapter->hw; 3257 struct e1000_hw *hw = &adapter->hw;
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 63415bb6f48f..428bf6d72f37 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4097,7 +4097,8 @@ static int e1000_maybe_stop_tx(struct net_device *netdev, int size)
4097} 4097}
4098 4098
4099#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 ) 4099#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
4100static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 4100static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
4101 struct net_device *netdev)
4101{ 4102{
4102 struct e1000_adapter *adapter = netdev_priv(netdev); 4103 struct e1000_adapter *adapter = netdev_priv(netdev);
4103 struct e1000_ring *tx_ring = adapter->tx_ring; 4104 struct e1000_ring *tx_ring = adapter->tx_ring;
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index cef4289d5716..7a054d99bff1 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -98,9 +98,11 @@ static void igb_set_multi(struct net_device *);
98static void igb_update_phy_info(unsigned long); 98static void igb_update_phy_info(unsigned long);
99static void igb_watchdog(unsigned long); 99static void igb_watchdog(unsigned long);
100static void igb_watchdog_task(struct work_struct *); 100static void igb_watchdog_task(struct work_struct *);
101static int igb_xmit_frame_ring_adv(struct sk_buff *, struct net_device *, 101static netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *,
102 struct igb_ring *); 102 struct net_device *,
103static int igb_xmit_frame_adv(struct sk_buff *skb, struct net_device *); 103 struct igb_ring *);
104static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb,
105 struct net_device *);
104static struct net_device_stats *igb_get_stats(struct net_device *); 106static struct net_device_stats *igb_get_stats(struct net_device *);
105static int igb_change_mtu(struct net_device *, int); 107static int igb_change_mtu(struct net_device *, int);
106static int igb_set_mac(struct net_device *, void *); 108static int igb_set_mac(struct net_device *, void *);
@@ -3295,9 +3297,9 @@ static int igb_maybe_stop_tx(struct net_device *netdev,
3295 return __igb_maybe_stop_tx(netdev, tx_ring, size); 3297 return __igb_maybe_stop_tx(netdev, tx_ring, size);
3296} 3298}
3297 3299
3298static int igb_xmit_frame_ring_adv(struct sk_buff *skb, 3300static netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,
3299 struct net_device *netdev, 3301 struct net_device *netdev,
3300 struct igb_ring *tx_ring) 3302 struct igb_ring *tx_ring)
3301{ 3303{
3302 struct igb_adapter *adapter = netdev_priv(netdev); 3304 struct igb_adapter *adapter = netdev_priv(netdev);
3303 unsigned int first; 3305 unsigned int first;
@@ -3385,7 +3387,8 @@ static int igb_xmit_frame_ring_adv(struct sk_buff *skb,
3385 return NETDEV_TX_OK; 3387 return NETDEV_TX_OK;
3386} 3388}
3387 3389
3388static int igb_xmit_frame_adv(struct sk_buff *skb, struct net_device *netdev) 3390static netdev_tx_t igb_xmit_frame_adv(struct sk_buff *skb,
3391 struct net_device *netdev)
3389{ 3392{
3390 struct igb_adapter *adapter = netdev_priv(netdev); 3393 struct igb_adapter *adapter = netdev_priv(netdev);
3391 struct igb_ring *tx_ring; 3394 struct igb_ring *tx_ring;
@@ -3398,7 +3401,7 @@ static int igb_xmit_frame_adv(struct sk_buff *skb, struct net_device *netdev)
3398 * to a flow. Right now, performance is impacted slightly negatively 3401 * to a flow. Right now, performance is impacted slightly negatively
3399 * if using multiple tx queues. If the stack breaks away from a 3402 * if using multiple tx queues. If the stack breaks away from a
3400 * single qdisc implementation, we can look at this again. */ 3403 * single qdisc implementation, we can look at this again. */
3401 return (igb_xmit_frame_ring_adv(skb, netdev, tx_ring)); 3404 return igb_xmit_frame_ring_adv(skb, netdev, tx_ring);
3402} 3405}
3403 3406
3404/** 3407/**
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
2207static int igbvf_xmit_frame_ring_adv(struct sk_buff *skb, 2207static 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
2282static int igbvf_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 2282static 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/**
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index fad08ce8a6c3..8aa44dca57eb 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -81,7 +81,8 @@ static void ixgb_clean_tx_ring(struct ixgb_adapter *adapter);
81static void ixgb_clean_rx_ring(struct ixgb_adapter *adapter); 81static void ixgb_clean_rx_ring(struct ixgb_adapter *adapter);
82static void ixgb_set_multi(struct net_device *netdev); 82static void ixgb_set_multi(struct net_device *netdev);
83static void ixgb_watchdog(unsigned long data); 83static void ixgb_watchdog(unsigned long data);
84static int ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev); 84static netdev_tx_t ixgb_xmit_frame(struct sk_buff *skb,
85 struct net_device *netdev);
85static struct net_device_stats *ixgb_get_stats(struct net_device *netdev); 86static struct net_device_stats *ixgb_get_stats(struct net_device *netdev);
86static int ixgb_change_mtu(struct net_device *netdev, int new_mtu); 87static int ixgb_change_mtu(struct net_device *netdev, int new_mtu);
87static int ixgb_set_mac(struct net_device *netdev, void *p); 88static int ixgb_set_mac(struct net_device *netdev, void *p);
@@ -1442,7 +1443,7 @@ static int ixgb_maybe_stop_tx(struct net_device *netdev,
1442 MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1 /* for context */ \ 1443 MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE) + 1 /* for context */ \
1443 + 1 /* one more needed for sentinel TSO workaround */ 1444 + 1 /* one more needed for sentinel TSO workaround */
1444 1445
1445static int 1446static netdev_tx_t
1446ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 1447ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
1447{ 1448{
1448 struct ixgb_adapter *adapter = netdev_priv(netdev); 1449 struct ixgb_adapter *adapter = netdev_priv(netdev);
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 0bea096e964b..7e964a689883 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -5107,7 +5107,8 @@ static u16 ixgbe_select_queue(struct net_device *dev, struct sk_buff *skb)
5107 return skb_tx_hash(dev, skb); 5107 return skb_tx_hash(dev, skb);
5108} 5108}
5109 5109
5110static int ixgbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 5110static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
5111 struct net_device *netdev)
5111{ 5112{
5112 struct ixgbe_adapter *adapter = netdev_priv(netdev); 5113 struct ixgbe_adapter *adapter = netdev_priv(netdev);
5113 struct ixgbe_ring *tx_ring; 5114 struct ixgbe_ring *tx_ring;