diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:14:07 -0400 |
commit | 61357325f377889a1daffa14962d705dc814dd0e (patch) | |
tree | 7b436f1097abbc5681de6d1e5901f62963b42220 /drivers/net/skfp | |
parent | d0cf9c0dadcdc89a755bcb301cfc9c796eb28ccf (diff) |
netdev: convert bulk of drivers to netdev_tx_t
In a couple of cases collapse some extra code like:
int retval = NETDEV_TX_OK;
...
return retval;
into
return NETDEV_TX_OK;
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/skfp')
-rw-r--r-- | drivers/net/skfp/skfddi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 888a14a045ef..38a508b4aad9 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
@@ -107,7 +107,8 @@ static void skfp_ctl_set_multicast_list(struct net_device *dev); | |||
107 | static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev); | 107 | static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev); |
108 | static int skfp_ctl_set_mac_address(struct net_device *dev, void *addr); | 108 | static int skfp_ctl_set_mac_address(struct net_device *dev, void *addr); |
109 | static int skfp_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | 109 | static int skfp_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); |
110 | static int skfp_send_pkt(struct sk_buff *skb, struct net_device *dev); | 110 | static netdev_tx_t skfp_send_pkt(struct sk_buff *skb, |
111 | struct net_device *dev); | ||
111 | static void send_queued_packets(struct s_smc *smc); | 112 | static void send_queued_packets(struct s_smc *smc); |
112 | static void CheckSourceAddress(unsigned char *frame, unsigned char *hw_addr); | 113 | static void CheckSourceAddress(unsigned char *frame, unsigned char *hw_addr); |
113 | static void ResetAdapter(struct s_smc *smc); | 114 | static void ResetAdapter(struct s_smc *smc); |
@@ -1056,7 +1057,8 @@ static int skfp_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
1056 | * Side Effects: | 1057 | * Side Effects: |
1057 | * None | 1058 | * None |
1058 | */ | 1059 | */ |
1059 | static int skfp_send_pkt(struct sk_buff *skb, struct net_device *dev) | 1060 | static netdev_tx_t skfp_send_pkt(struct sk_buff *skb, |
1061 | struct net_device *dev) | ||
1060 | { | 1062 | { |
1061 | struct s_smc *smc = netdev_priv(dev); | 1063 | struct s_smc *smc = netdev_priv(dev); |
1062 | skfddi_priv *bp = &smc->os; | 1064 | skfddi_priv *bp = &smc->os; |