git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pandora: update defconfig
[pandora-kernel.git]
/
drivers
/
char
/
synclinkmp.c
diff --git
a/drivers/char/synclinkmp.c
b/drivers/char/synclinkmp.c
index
6f727e3
..
2b18adc
100644
(file)
--- a/
drivers/char/synclinkmp.c
+++ b/
drivers/char/synclinkmp.c
@@
-52,6
+52,7
@@
#include <linux/mm.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
+#include <linux/smp_lock.h>
#include <linux/netdevice.h>
#include <linux/vmalloc.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/vmalloc.h>
#include <linux/init.h>
@@
-1607,10
+1608,9
@@
static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
*
* skb socket buffer containing HDLC frame
* dev pointer to network device structure
*
* skb socket buffer containing HDLC frame
* dev pointer to network device structure
- *
- * returns 0 if success, otherwise error code
*/
*/
-static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
+ struct net_device *dev)
{
SLMP_INFO *info = dev_to_port(dev);
unsigned long flags;
{
SLMP_INFO *info = dev_to_port(dev);
unsigned long flags;
@@
-1641,7
+1641,7
@@
static int hdlcdev_xmit(struct sk_buff *skb, struct net_device *dev)
tx_start(info);
spin_unlock_irqrestore(&info->lock,flags);
tx_start(info);
spin_unlock_irqrestore(&info->lock,flags);
- return
0
;
+ return
NETDEV_TX_OK
;
}
/**
}
/**