소스 검색

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>
kirjanov@gmail.com 15 년 전
부모
커밋
203fe0d2e9
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      drivers/staging/slicoss/slicoss.c

+ 2 - 2
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_open(struct net_device *dev);
 static int slic_entry_halt(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_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,
 static void slic_xmit_fail(struct adapter *adapter, struct sk_buff *skb,
 			   void *cmd, u32 skbtype, u32 status);
 			   void *cmd, u32 skbtype, u32 status);
 static void slic_config_pci(struct pci_dev *pcidev);
 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
 #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 sliccard *card;
 	struct adapter *adapter = (struct adapter *)netdev_priv(dev);
 	struct adapter *adapter = (struct adapter *)netdev_priv(dev);