1 files changed, 8 insertions, 7 deletions

diff --git a/net/802/psnap.c b/net/802/psnap.c
index 70980baeb682..6fea0750662b 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -29,7 +29,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 +51,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 +95,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 +122,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 +137,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;