diff options
| author |   kirjanov@gmail.com <kirjanov@gmail.com> | 2009-12-18 10:51:07 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 16:42:28 -0800 |
| commit | 203fe0d2e99598eb960baf2cc4b88b6e794e5a20 (patch) | |
| tree | 1c35cd067d65ce0a5505e7d5def6046db649b8b4 /drivers/staging/slicoss | |
| parent | Staging: vme: Allow drivers to co-exist (diff) | |
| download | linux-dev-203fe0d2e99598eb960baf2cc4b88b6e794e5a20.tar.xz linux-dev-203fe0d2e99598eb960baf2cc4b88b6e794e5a20.zip | |
staging: slicoss Convert to netdev_tx_t
Convert to netdev_tx_t.
Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/slicoss')
| -rw-r--r-- | drivers/staging/slicoss/slicoss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 5b191afc1442..a18eeb62f4ef 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -101,7 +101,7 @@ static struct net_device_stats *slic_get_stats(struct net_device *dev); static int slic_entry_open(struct net_device *dev); static int slic_entry_halt(struct net_device *dev); static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); -static int slic_xmit_start(struct sk_buff *skb, struct net_device *dev); +static netdev_tx_t slic_xmit_start(struct sk_buff *skb, struct net_device *dev); static void slic_xmit_fail(struct adapter *adapter, struct sk_buff *skb, void *cmd, u32 skbtype, u32 status); static void slic_config_pci(struct pci_dev *pcidev); @@ -784,7 +784,7 @@ static void slic_xmit_build_request(struct adapter *adapter, #define NORMAL_ETHFRAME 0 -static int slic_xmit_start(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t slic_xmit_start(struct sk_buff *skb, struct net_device *dev) { struct sliccard *card; struct adapter *adapter = (struct adapter *)netdev_priv(dev); |