1 files changed, 6 insertions, 10 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index 5abce07fb50a..d6a9243641af 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -1571,14 +1571,10 @@ static int atalk_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
                     usat->sat_family != AF_APPLETALK)
                         return -EINVAL;
 
-                /* netatalk doesn't implement this check */
+                /* netatalk didn't implement this check */
                 if (usat->sat_addr.s_node == ATADDR_BCAST &&
                     !sock_flag(sk, SOCK_BROADCAST)) {
-                        printk(KERN_INFO "SO_BROADCAST: Fix your netatalk as "
-                                         "it will break before 2.2\n");
-#if 0
                         return -EPERM;
-#endif
                 }
         } else {
                 if (sk->sk_state != TCP_ESTABLISHED)
@@ -1860,13 +1856,13 @@ static struct notifier_block ddp_notifier = {
         .notifier_call  = ddp_device_event,
 };
 
-static struct packet_type ltalk_packet_type = {
-        .type           = __constant_htons(ETH_P_LOCALTALK),
+static struct packet_type ltalk_packet_type __read_mostly = {
+        .type           = cpu_to_be16(ETH_P_LOCALTALK),
         .func           = ltalk_rcv,
 };
 
-static struct packet_type ppptalk_packet_type = {
-        .type           = __constant_htons(ETH_P_PPPTALK),
+static struct packet_type ppptalk_packet_type __read_mostly = {
+        .type           = cpu_to_be16(ETH_P_PPPTALK),
         .func           = atalk_rcv,
 };
 
@@ -1877,7 +1873,7 @@ EXPORT_SYMBOL(aarp_send_ddp);
 EXPORT_SYMBOL(atrtr_get_dev);
 EXPORT_SYMBOL(atalk_find_dev_addr);
 
-static char atalk_err_snap[] __initdata =
+static const char atalk_err_snap[] __initconst =
         KERN_CRIT "Unable to register DDP with SNAP.\n";
 
 /* Called by proto.c on kernel start up */