diff options
-rw-r--r-- | drivers/net/ethernet/micrel/ks8695net.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/ks8851_mll.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c index bd51e057e915..b881f5d4a7f9 100644 --- a/drivers/net/ethernet/micrel/ks8695net.c +++ b/drivers/net/ethernet/micrel/ks8695net.c | |||
@@ -1164,7 +1164,7 @@ ks8695_timeout(struct net_device *ndev) | |||
1164 | * sk_buff and adds it to the TX ring. It then kicks the TX DMA | 1164 | * sk_buff and adds it to the TX ring. It then kicks the TX DMA |
1165 | * engine to ensure transmission begins. | 1165 | * engine to ensure transmission begins. |
1166 | */ | 1166 | */ |
1167 | static int | 1167 | static netdev_tx_t |
1168 | ks8695_start_xmit(struct sk_buff *skb, struct net_device *ndev) | 1168 | ks8695_start_xmit(struct sk_buff *skb, struct net_device *ndev) |
1169 | { | 1169 | { |
1170 | struct ks8695_priv *ksp = netdev_priv(ndev); | 1170 | struct ks8695_priv *ksp = netdev_priv(ndev); |
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c index 0e9719fbc624..35f8c9ef204d 100644 --- a/drivers/net/ethernet/micrel/ks8851_mll.c +++ b/drivers/net/ethernet/micrel/ks8851_mll.c | |||
@@ -1021,9 +1021,9 @@ static void ks_write_qmu(struct ks_net *ks, u8 *pdata, u16 len) | |||
1021 | * spin_lock_irqsave is required because tx and rx should be mutual exclusive. | 1021 | * spin_lock_irqsave is required because tx and rx should be mutual exclusive. |
1022 | * So while tx is in-progress, prevent IRQ interrupt from happenning. | 1022 | * So while tx is in-progress, prevent IRQ interrupt from happenning. |
1023 | */ | 1023 | */ |
1024 | static int ks_start_xmit(struct sk_buff *skb, struct net_device *netdev) | 1024 | static netdev_tx_t ks_start_xmit(struct sk_buff *skb, struct net_device *netdev) |
1025 | { | 1025 | { |
1026 | int retv = NETDEV_TX_OK; | 1026 | netdev_tx_t retv = NETDEV_TX_OK; |
1027 | struct ks_net *ks = netdev_priv(netdev); | 1027 | struct ks_net *ks = netdev_priv(netdev); |
1028 | 1028 | ||
1029 | disable_irq(netdev->irq); | 1029 | disable_irq(netdev->irq); |