9p: VFS switches for 9p2000.L: protocol and client changes

[safe/jmp/linux-2.6] / net / 802 / psnap.c

diff --git a/net/802/psnap.c b/net/802/psnap.c
index b3cfe5a..21cde8f 100644 (file)
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -1,7 +1,7 @@
 /*
  *     SNAP data link layer. Derived from 802.2
  *
- *             Alan Cox <Alan.Cox@linux.org>,
+ *             Alan Cox <alan@lxorguk.ukuu.org.uk>,
  *             from the 802.2 layer by Greg Page.
  *             Merged in additions from Greg Page's psnap.c.
  *
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <net/datalink.h>
 #include <net/llc.h>
 #include <net/psnap.h>
@@ -29,7 +30,7 @@ static struct llc_sap *snap_sap;
 /*
  *     Find a snap client by matching the 5 bytes.
  */
-static struct datalink_proto *find_snap_client(unsigned char *desc)
+static struct datalink_proto *find_snap_client(const unsigned char *desc)
 {
        struct datalink_proto *proto = NULL, *p;
 
@@ -51,7 +52,7 @@ static int snap_rcv(struct sk_buff *skb, struct net_device *dev,
        int rc = 1;
        struct datalink_proto *proto;
        static struct packet_type snap_packet_type = {
-               .type = __constant_htons(ETH_P_SNAP),
+               .type = cpu_to_be16(ETH_P_SNAP),
        };
 
        if (unlikely(!pskb_may_pull(skb, 5)))
@@ -95,15 +96,16 @@ static int snap_request(struct datalink_proto *dl,
 EXPORT_SYMBOL(register_snap_client);
 EXPORT_SYMBOL(unregister_snap_client);
 
-static char snap_err_msg[] __initdata =
+static const char snap_err_msg[] __initconst =
        KERN_CRIT "SNAP - unable to register with 802.2\n";
 
 static int __init snap_init(void)
 {
        snap_sap = llc_sap_open(0xAA, snap_rcv);
-
-       if (!snap_sap)
+       if (!snap_sap) {
                printk(snap_err_msg);
+               return -EBUSY;
+       }
 
        return 0;
 }
@@ -121,7 +123,7 @@ module_exit(snap_exit);
 /*
  *     Register SNAP clients. We don't yet use this for IP.
  */
-struct datalink_proto *register_snap_client(unsigned char *desc,
+struct datalink_proto *register_snap_client(const unsigned char *desc,
                                            int (*rcvfunc)(struct sk_buff *,
                                                           struct net_device *,
                                                           struct packet_type *,
@@ -136,7 +138,7 @@ struct datalink_proto *register_snap_client(unsigned char *desc,
 
        proto = kmalloc(sizeof(*proto), GFP_ATOMIC);
        if (proto) {
-               memcpy(proto->type, desc,5);
+               memcpy(proto->type, desc, 5);
                proto->rcvfunc          = rcvfunc;
                proto->header_length    = 5 + 3; /* snap + 802.2 */
                proto->request          = snap_request;