Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (235 commits)
  [NETFILTER]: Add H.323 conntrack/NAT helper
  [TG3]: Don't mark tg3_test_registers() as returning const.
  [IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2
  [IPV6]: Nearly complete kzalloc cleanup for net/ipv6
  [IPV6]: Cleanup of net/ipv6/reassambly.c
  [BRIDGE]: Remove duplicate const from is_link_local() argument type.
  [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking
  [TG3]: make drivers/net/tg3.c:tg3_request_irq() static
  [BRIDGE]: use LLC to send STP
  [LLC]: llc_mac_hdr_init const arguments
  [BRIDGE]: allow show/store of group multicast address
  [BRIDGE]: use llc for receiving STP packets
  [BRIDGE]: stp timer to jiffies cleanup
  [BRIDGE]: forwarding remove unneeded preempt and bh diasables
  [BRIDGE]: netfilter inline cleanup
  [BRIDGE]: netfilter VLAN macro cleanup
  [BRIDGE]: netfilter dont use __constant_htons
  [BRIDGE]: netfilter whitespace
  [BRIDGE]: optimize frame pass up
  [BRIDGE]: use kzalloc
  ...

1 files changed, 15 insertions, 15 deletions

diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
index 5ff38b9f3194..c5f026c7fd38 100644
--- a/net/tipc/subscr.c
+++ b/net/tipc/subscr.c
@@ -86,7 +86,7 @@ static struct top_srv topsrv = { 0 };
  * Returns converted value
  */
 
-static inline u32 htohl(u32 in, int swap)
+static u32 htohl(u32 in, int swap)
 {
         char *c = (char *)∈
 
@@ -381,7 +381,7 @@ static void subscr_named_msg_event(void *usr_handle,
                                    struct tipc_name_seq const *dest)
 {
         struct subscriber *subscriber;
-        struct iovec msg_sect = {0, 0};
+        struct iovec msg_sect = {NULL, 0};
         spinlock_t *subscriber_lock;
 
         dbg("subscr_named_msg_event: orig = %x own = %x,\n",
@@ -413,13 +413,13 @@ static void subscr_named_msg_event(void *usr_handle,
         tipc_createport(topsrv.user_ref,
                         (void *)(unsigned long)subscriber->ref,
                         importance,
-                        0,
-                        0,
+                        NULL,
+                        NULL,
                         subscr_conn_shutdown_event,
-                        0,
-                        0,
+                        NULL,
+                        NULL,
                         subscr_conn_msg_event,
-                        0,
+                        NULL,
                         &subscriber->port_ref);
         if (subscriber->port_ref == 0) {
                 warn("Memory squeeze; failed to create subscription port\n");
@@ -461,22 +461,22 @@ int tipc_subscr_start(void)
         INIT_LIST_HEAD(&topsrv.subscriber_list);
 
         spin_lock_bh(&topsrv.lock);
-        res = tipc_attach(&topsrv.user_ref, 0, 0);
+        res = tipc_attach(&topsrv.user_ref, NULL, NULL);
         if (res) {
                 spin_unlock_bh(&topsrv.lock);
                 return res;
         }
 
         res = tipc_createport(topsrv.user_ref,
-                              0,
+                              NULL,
                               TIPC_CRITICAL_IMPORTANCE,
-                              0,
-                              0,
-                              0,
-                              0,
+                              NULL,
+                              NULL,
+                              NULL,
+                              NULL,
                               subscr_named_msg_event,
-                              0,
-                              0,
+                              NULL,
+                              NULL,
                               &topsrv.setup_port);
         if (res)
                 goto failed;