Merge git://oss.sgi.com:8090/xfs/linux-2.6

[linux-2.6] / net / 802 / p8022.c

diff --git a/net/802/p8022.c b/net/802/p8022.c
index 5ae63416df6dfc1bcdd58c10004a3d4b49487df9..2530f35241cde096a08a748790d74b75f8b22884 100644 (file)
--- a/net/802/p8022.c
+++ b/net/802/p8022.c
@@ -35,7 +35,8 @@ static int p8022_request(struct datalink_proto *dl, struct sk_buff *skb,
 struct datalink_proto *register_8022_client(unsigned char type,
                                            int (*func)(struct sk_buff *skb,
                                                        struct net_device *dev,
-                                                       struct packet_type *pt))
+                                                       struct packet_type *pt,
+                                                       struct net_device *orig_dev))
 {
        struct datalink_proto *proto;
 
@@ -55,7 +56,7 @@ struct datalink_proto *register_8022_client(unsigned char type,
 
 void unregister_8022_client(struct datalink_proto *proto)
 {
-       llc_sap_close(proto->sap);
+       llc_sap_put(proto->sap);
        kfree(proto);
 }