patch staging-slicoss-convert-to-netdev_tx_t.patch added to gregkh-2.6 tree
A message that is not in the archive (sent off-list or not yet received): 20091218075107.GA4479@coldcone
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
Subject: staging: slicoss Convert to netdev_tx_t
to my gregkh-2.6 tree. Its filename is
staging-slicoss-convert-to-netdev_tx_t.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
Quoted 1 line
From [email protected] Fri Dec 18 10:32:34 2009
From: "Denis Kirjanov <[email protected]" <[email protected]>
Date: Fri, 18 Dec 2009 10:51:07 +0300
Subject: staging: slicoss Convert to netdev_tx_t
To: [email protected], [email protected], [email protected]
Cc: [email protected]
Message-ID: <20091218075107.GA4479@coldcone>
Content-Disposition: inline
Convert to netdev_tx_t.
--- drivers/staging/slicoss/slicoss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/slicoss/slicoss.c +2 -2
@@ -101,7 +101,7 @@ static struct net_device_stats *slic_getstatic 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(stru#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);