git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
wan
/
lapbether.c
diff --git
a/drivers/net/wan/lapbether.c
b/drivers/net/wan/lapbether.c
index
7f2e365
..
6c302e9
100644
(file)
--- a/
drivers/net/wan/lapbether.c
+++ b/
drivers/net/wan/lapbether.c
@@
-86,7
+86,7
@@
static __inline__ int dev_is_ethdev(struct net_device *dev)
/*
* Receive a LAPB frame via an ethernet interface.
*/
/*
* Receive a LAPB frame via an ethernet interface.
*/
-static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype)
+static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype
, struct net_device *orig_dev
)
{
int len, err;
struct lapbethdev *lapbeth;
{
int len, err;
struct lapbethdev *lapbeth;