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
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wan
/
sbni.c
diff --git
a/drivers/net/wan/sbni.c
b/drivers/net/wan/sbni.c
index
d14e95a
..
85c02a2
100644
(file)
--- a/
drivers/net/wan/sbni.c
+++ b/
drivers/net/wan/sbni.c
@@
-463,7
+463,7
@@
sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )
prepare_to_send( skb, p );
spin_unlock( &nl->lock );
netif_start_queue( dev );
- return
0
;
+ return
NETDEV_TX_OK
;
}
}
@@
-483,7
+483,7
@@
sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )
prepare_to_send( skb, dev );
spin_unlock( &nl->lock );
- return
0
;
+ return
NETDEV_TX_OK
;
}
#endif /* CONFIG_SBNI_MULTILINE */