Merge branch 'linux-2.6' into for-2.6.22

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/ecryptfs/netlink.c b/fs/ecryptfs/netlink.c
index e3aa2253c850..fe9186312d7c 100644
--- a/fs/ecryptfs/netlink.c
+++ b/fs/ecryptfs/netlink.c
@@ -97,7 +97,7 @@ out:
  */
 static int ecryptfs_process_nl_response(struct sk_buff *skb)
 {
-        struct nlmsghdr *nlh = (struct nlmsghdr*)skb->data;
+        struct nlmsghdr *nlh = nlmsg_hdr(skb);
         struct ecryptfs_message *msg = NLMSG_DATA(nlh);
         int rc;
 
@@ -181,7 +181,7 @@ receive:
                                 "rc = [%d]\n", rc);
                 return;
         }
-        nlh = (struct nlmsghdr *)skb->data;
+        nlh = nlmsg_hdr(skb);
         if (!NLMSG_OK(nlh, skb->len)) {
                 ecryptfs_printk(KERN_ERR, "Received corrupt netlink "
                                 "message\n");
@@ -229,7 +229,7 @@ int ecryptfs_init_netlink(void)
 
         ecryptfs_nl_sock = netlink_kernel_create(NETLINK_ECRYPTFS, 0,
                                                  ecryptfs_receive_nl_message,
-                                                 THIS_MODULE);
+                                                 NULL, THIS_MODULE);
         if (!ecryptfs_nl_sock) {
                 rc = -EIO;
                 ecryptfs_printk(KERN_ERR, "Failed to create netlink socket\n");