cfg80211: wext: don't display BSSID unless associated

[safe/jmp/linux-2.6] / net / tipc / netlink.c

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 4cdafa2..7bda8e3 100644 (file)
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -2,7 +2,7 @@
  * net/tipc/netlink.c: TIPC configuration handling
  *
  * Copyright (c) 2005-2006, Ericsson AB
- * Copyright (c) 2005, Wind River Systems
+ * Copyright (c) 2005-2007, Wind River Systems
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,28 +45,30 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
        struct nlmsghdr *req_nlh = info->nlhdr;
        struct tipc_genlmsghdr *req_userhdr = info->userhdr;
        int hdr_space = NLMSG_SPACE(GENL_HDRLEN + TIPC_GENL_HDRLEN);
+       u16 cmd;
 
        if ((req_userhdr->cmd & 0xC000) && (!capable(CAP_NET_ADMIN)))
-               rep_buf = tipc_cfg_reply_error_string(TIPC_CFG_NOT_NET_ADMIN);
+               cmd = TIPC_CMD_NOT_NET_ADMIN;
        else
-               rep_buf = tipc_cfg_do_cmd(req_userhdr->dest,
-                                         req_userhdr->cmd,
-                                         NLMSG_DATA(req_nlh) + GENL_HDRLEN + TIPC_GENL_HDRLEN,
-                                         NLMSG_PAYLOAD(req_nlh, GENL_HDRLEN + TIPC_GENL_HDRLEN),
-                                         hdr_space);
+               cmd = req_userhdr->cmd;
+
+       rep_buf = tipc_cfg_do_cmd(req_userhdr->dest, cmd,
+                       NLMSG_DATA(req_nlh) + GENL_HDRLEN + TIPC_GENL_HDRLEN,
+                       NLMSG_PAYLOAD(req_nlh, GENL_HDRLEN + TIPC_GENL_HDRLEN),
+                       hdr_space);
 
        if (rep_buf) {
                skb_push(rep_buf, hdr_space);
                rep_nlh = nlmsg_hdr(rep_buf);
                memcpy(rep_nlh, req_nlh, hdr_space);
                rep_nlh->nlmsg_len = rep_buf->len;
-               genlmsg_unicast(rep_buf, req_nlh->nlmsg_pid);
+               genlmsg_unicast(&init_net, rep_buf, NETLINK_CB(skb).pid);
        }
 
        return 0;
 }
 
-static struct genl_family family = {
+static struct genl_family tipc_genl_family = {
        .id             = GENL_ID_GENERATE,
        .name           = TIPC_GENL_NAME,
        .version        = TIPC_GENL_VERSION,
@@ -74,39 +76,33 @@ static struct genl_family family = {
        .maxattr        = 0,
 };
 
-static struct genl_ops ops = {
+static struct genl_ops tipc_genl_ops = {
        .cmd            = TIPC_GENL_CMD,
        .doit           = handle_cmd,
 };
 
-static int family_registered = 0;
+static int tipc_genl_family_registered;
 
 int tipc_netlink_start(void)
 {
+       int res;
 
+       res = genl_register_family_with_ops(&tipc_genl_family,
+               &tipc_genl_ops, 1);
+       if (res) {
+               err("Failed to register netlink interface\n");
+               return res;
+       }
 
-       if (genl_register_family(&family))
-               goto err;
-
-       family_registered = 1;
-
-       if (genl_register_ops(&family, &ops))
-               goto err_unregister;
-
+       tipc_genl_family_registered = 1;
        return 0;
-
- err_unregister:
-       genl_unregister_family(&family);
-       family_registered = 0;
- err:
-       err("Failed to register netlink interface\n");
-       return -EFAULT;
 }
 
 void tipc_netlink_stop(void)
 {
-       if (family_registered) {
-               genl_unregister_family(&family);
-               family_registered = 0;
-       }
+       if (!tipc_genl_family_registered)
+               return;
+
+       genl_unregister_family(&tipc_genl_family);
+       tipc_genl_family_registered = 0;
 }