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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (60 commits)
  [NIU]: Bump driver version and release date.
  [NIU]: Fix BMAC alternate MAC address indexing.
  net: fix kernel-doc warnings in header files
  [IPV6]: Use BUG_ON instead of if + BUG in fib6_del_route.
  [IPV6]: dst_entry leak in ip4ip6_err. (resend)
  bluetooth: do not move child device other than rfcomm
  bluetooth: put hci dev after del conn
  [NET]: Elminate spurious print_mac() calls.
  [BLUETOOTH] hci_sysfs.c: Kill build warning.
  [NET]: Remove MAC_FMT
  net/8021q/vlan_dev.c: Use print_mac.
  [XFRM]: Fix ordering issue in xfrm_dst_hash_transfer().
  [BLUETOOTH] net/bluetooth/hci_core.c: Use time_* macros
  [IPV6]: Fix hardcoded removing of old module code
  [NETLABEL]: Move some initialization code into __init section.
  [NETLABEL]: Shrink the genl-ops registration code.
  [AX25] ax25_out: check skb for NULL in ax25_kick()
  [TCP]: Fix tcp_v4_send_synack() comment
  [IPV4]: fix alignment of IP-Config output
  Documentation: fix tcp.txt
  ...

1 files changed, 17 insertions, 28 deletions

diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index c7ad64d664ad..fdc14a0d21af 100644
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -718,36 +718,35 @@ static int netlbl_cipsov4_remove(struct sk_buff *skb, struct genl_info *info)
  * NetLabel Generic NETLINK Command Definitions
  */
 
-static struct genl_ops netlbl_cipsov4_genl_c_add = {
+static struct genl_ops netlbl_cipsov4_ops[] = {
+        {
         .cmd = NLBL_CIPSOV4_C_ADD,
         .flags = GENL_ADMIN_PERM,
         .policy = netlbl_cipsov4_genl_policy,
         .doit = netlbl_cipsov4_add,
         .dumpit = NULL,
-};
-
-static struct genl_ops netlbl_cipsov4_genl_c_remove = {
+        },
+        {
         .cmd = NLBL_CIPSOV4_C_REMOVE,
         .flags = GENL_ADMIN_PERM,
         .policy = netlbl_cipsov4_genl_policy,
         .doit = netlbl_cipsov4_remove,
         .dumpit = NULL,
-};
-
-static struct genl_ops netlbl_cipsov4_genl_c_list = {
+        },
+        {
         .cmd = NLBL_CIPSOV4_C_LIST,
         .flags = 0,
         .policy = netlbl_cipsov4_genl_policy,
         .doit = netlbl_cipsov4_list,
         .dumpit = NULL,
-};
-
-static struct genl_ops netlbl_cipsov4_genl_c_listall = {
+        },
+        {
         .cmd = NLBL_CIPSOV4_C_LISTALL,
         .flags = 0,
         .policy = netlbl_cipsov4_genl_policy,
         .doit = NULL,
         .dumpit = netlbl_cipsov4_listall,
+        },
 };
 
 /*
@@ -762,30 +761,20 @@ static struct genl_ops netlbl_cipsov4_genl_c_listall = {
  * mechanism.  Returns zero on success, negative values on failure.
  *
  */
-int netlbl_cipsov4_genl_init(void)
+int __init netlbl_cipsov4_genl_init(void)
 {
-        int ret_val;
+        int ret_val, i;
 
         ret_val = genl_register_family(&netlbl_cipsov4_gnl_family);
         if (ret_val != 0)
                 return ret_val;
 
-        ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
-                                    &netlbl_cipsov4_genl_c_add);
-        if (ret_val != 0)
-                return ret_val;
-        ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
-                                    &netlbl_cipsov4_genl_c_remove);
-        if (ret_val != 0)
-                return ret_val;
-        ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
-                                    &netlbl_cipsov4_genl_c_list);
-        if (ret_val != 0)
-                return ret_val;
-        ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
-                                    &netlbl_cipsov4_genl_c_listall);
-        if (ret_val != 0)
-                return ret_val;
+        for (i = 0; i < ARRAY_SIZE(netlbl_cipsov4_ops); i++) {
+                ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
+                                &netlbl_cipsov4_ops[i]);
+                if (ret_val != 0)
+                        return ret_val;
+        }
 
         return 0;
 }