mac80211: fix modprobe deadlock by not calling wep_init under rtnl_lock

[safe/jmp/linux-2.6] / net / netlabel / netlabel_user.h

diff --git a/net/netlabel/netlabel_user.h b/net/netlabel/netlabel_user.h
index ab840ac..6caef8b 100644 (file)
--- a/net/netlabel/netlabel_user.h
+++ b/net/netlabel/netlabel_user.h
@@ -42,34 +42,16 @@
 /* NetLabel NETLINK helper functions */
 
 /**
- * netlbl_netlink_hdr_put - Write the NETLINK buffers into a sk_buff
+ * netlbl_netlink_auditinfo - Fetch the audit information from a NETLINK msg
  * @skb: the packet
- * @pid: the PID of the receipient
- * @seq: the sequence number
- * @type: the generic NETLINK message family type
- * @cmd: command
- *
- * Description:
- * Write both a NETLINK nlmsghdr structure and a Generic NETLINK genlmsghdr
- * struct to the packet.  Returns a pointer to the start of the payload buffer
- * on success or NULL on failure.
- *
+ * @audit_info: NetLabel audit information
  */
-static inline void *netlbl_netlink_hdr_put(struct sk_buff *skb,
-                                          u32 pid,
-                                          u32 seq,
-                                          int type,
-                                          int flags,
-                                          u8 cmd)
+static inline void netlbl_netlink_auditinfo(struct sk_buff *skb,
+                                           struct netlbl_audit *audit_info)
 {
-       return genlmsg_put(skb,
-                          pid,
-                          seq,
-                          type,
-                          0,
-                          flags,
-                          cmd,
-                          NETLBL_PROTO_VERSION);
+       audit_info->secid = NETLINK_CB(skb).sid;
+       audit_info->loginuid = NETLINK_CB(skb).loginuid;
+       audit_info->sessionid = NETLINK_CB(skb).sessionid;
 }
 
 /* NetLabel NETLINK I/O functions */
@@ -78,7 +60,7 @@ int netlbl_netlink_init(void);
 
 /* NetLabel Audit Functions */
 
-struct audit_buffer *netlbl_audit_start_common(int type, u32 secid);
-void netlbl_audit_nomsg(int type, u32 secid);
+struct audit_buffer *netlbl_audit_start_common(int type,
+                                             struct netlbl_audit *audit_info);
 
 #endif