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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
802
/
psnap.c
diff --git
a/net/802/psnap.c
b/net/802/psnap.c
index
1053821
..
270b9d2
100644
(file)
--- a/
net/802/psnap.c
+++ b/
net/802/psnap.c
@@
-47,7
+47,7
@@
static struct datalink_proto *find_snap_client(unsigned char *desc)
* A SNAP packet has arrived
*/
static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
* A SNAP packet has arrived
*/
static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
- struct packet_type *pt)
+ struct packet_type *pt
, struct net_device *orig_dev
)
{
int rc = 1;
struct datalink_proto *proto;
{
int rc = 1;
struct datalink_proto *proto;
@@
-60,8
+60,8
@@
static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
if (proto) {
/* Pass the frame on. */
skb->h.raw += 5;
if (proto) {
/* Pass the frame on. */
skb->h.raw += 5;
- skb_pull(skb, 5);
- rc = proto->rcvfunc(skb, dev, &snap_packet_type);
+ skb_pull
_rcsum
(skb, 5);
+ rc = proto->rcvfunc(skb, dev, &snap_packet_type
, orig_dev
);
} else {
skb->sk = NULL;
kfree_skb(skb);
} else {
skb->sk = NULL;
kfree_skb(skb);
@@
-106,7
+106,7
@@
module_init(snap_init);
static void __exit snap_exit(void)
{
static void __exit snap_exit(void)
{
- llc_sap_
close
(snap_sap);
+ llc_sap_
put
(snap_sap);
}
module_exit(snap_exit);
}
module_exit(snap_exit);
@@
-118,7
+118,8
@@
module_exit(snap_exit);
struct datalink_proto *register_snap_client(unsigned char *desc,
int (*rcvfunc)(struct sk_buff *,
struct net_device *,
struct datalink_proto *register_snap_client(unsigned char *desc,
int (*rcvfunc)(struct sk_buff *,
struct net_device *,
- struct packet_type *))
+ struct packet_type *,
+ struct net_device *))
{
struct datalink_proto *proto = NULL;
{
struct datalink_proto *proto = NULL;