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]
/
net
/
x25
/
x25_dev.c
diff --git
a/net/x25/x25_dev.c
b/net/x25/x25_dev.c
index
36fc3bf
..
adfe7b8
100644
(file)
--- a/
net/x25/x25_dev.c
+++ b/
net/x25/x25_dev.c
@@
-81,7
+81,7
@@
static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
}
int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev,
- struct packet_type *ptype)
+ struct packet_type *ptype
, struct net_device *orig_dev
)
{
struct sk_buff *nskb;
struct x25_neigh *nb;