diff options
Diffstat (limited to 'drivers/net/ixgb/ixgb_main.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); | |||
81 | static void ixgb_clean_rx_ring(struct ixgb_adapter *adapter); | 81 | static void ixgb_clean_rx_ring(struct ixgb_adapter *adapter); |
82 | static void ixgb_set_multi(struct net_device *netdev); | 82 | static void ixgb_set_multi(struct net_device *netdev); |
83 | static void ixgb_watchdog(unsigned long data); | 83 | static void ixgb_watchdog(unsigned long data); |
84 | static int ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev); | 84 | static netdev_tx_t ixgb_xmit_frame(struct sk_buff *skb, |
85 | struct net_device *netdev); | ||
85 | static struct net_device_stats *ixgb_get_stats(struct net_device *netdev); | 86 | static struct net_device_stats *ixgb_get_stats(struct net_device *netdev); |
86 | static int ixgb_change_mtu(struct net_device *netdev, int new_mtu); | 87 | static int ixgb_change_mtu(struct net_device *netdev, int new_mtu); |
87 | static int ixgb_set_mac(struct net_device *netdev, void *p); | 88 | static 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 | ||
1445 | static int | 1446 | static netdev_tx_t |
1446 | ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | 1447 | ixgb_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); |