xfrm: spin_lock() should be spin_unlock() in xfrm_state.c

[karo-tx-linux.git] / net / tipc / bcast.h

diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h
index 5aa024b99c558ba2d6d6aeb5b26216dd67e52a9a..4c1771e95c99ed2ad0b43a07f2690fa69d043af0 100644 (file)
--- a/net/tipc/bcast.h
+++ b/net/tipc/bcast.h
@@ -70,7 +70,7 @@ struct port_list {
 
 struct tipc_node;
 
-extern char tipc_bclink_name[];
+extern const char tipc_bclink_name[];
 
 
 /**
@@ -124,7 +124,7 @@ static inline int tipc_nmap_equal(struct tipc_node_map *nm_a, struct tipc_node_m
 static inline void tipc_nmap_diff(struct tipc_node_map *nm_a, struct tipc_node_map *nm_b,
                                  struct tipc_node_map *nm_diff)
 {
-       int stop = sizeof(nm_a->map) / sizeof(u32);
+       int stop = ARRAY_SIZE(nm_a->map);
        int w;
        int b;
        u32 map;