Updated event.c compilation trouble

Dear scsitarget-devel@xxxxxxxxxxxxxxxxxxxxx

Please find attached my updated release of kernel/event.c file regarding 
the following compilation issue
CC [M]  /home/francois/iscsitarget-0.4.13/kernel/event.o
/home/francois/iscsitarget-0.4.13/kernel/event.c: In function 'notify':
/home/francois/iscsitarget-0.4.13/kernel/event.c:74: error: too many 
arguments to function '__nlmsg_put'
/home/francois/iscsitarget-0.4.13/kernel/event.c: In function 'event_init':
/home/francois/iscsitarget-0.4.13/kernel/event.c:98: warning: passing 
argument 2 of 'netlink_kernel_create' makes pointer from integer without 
a cast
/home/francois/iscsitarget-0.4.13/kernel/event.c:98: error: too many 
arguments to function 'netlink_kernel_create'
make[2]: *** [/home/francois/iscsitarget-0.4.13/kernel/event.o] Error 1
make[1]: *** [_module_/home/francois/iscsitarget-0.4.13/kernel] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.12-12mdk'
make: *** [mods] Error 2

It seems this issue had not been updated/corrected yet, i'm using the 
latest availlable downloads from sourceforge
I'm using a Mandriva 2006 linux running on Intel Centrino M revision 
with a 2.6.12-12mdk kernel
Do not hesitate to contact me for futher investigation

Regards

Francois


/*
 * Event notification code.
 * (C) 2005 FUJITA Tomonori <tomof@xxxxxxx>
 * This code is licenced under the GPL.
 *
 * Some functions are based on audit code.
 */

#include <net/tcp.h>
#include "iet_u.h"
#include "iscsi_dbg.h"

static struct sock *nl;
static u32 ietd_pid;

static int event_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
{
        u32 uid, pid, seq;
        char *data;

        pid  = NETLINK_CREDS(skb)->pid;
        uid  = NETLINK_CREDS(skb)->uid;
        seq  = nlh->nlmsg_seq;
        data = NLMSG_DATA(nlh);

        ietd_pid = pid;

        return 0;
}

static int event_recv_skb(struct sk_buff *skb)
{
        int err;
        struct nlmsghdr *nlh;
        u32 rlen;

        while (skb->len >= NLMSG_SPACE(0)) {
                nlh = (struct nlmsghdr *)skb->data;
                if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len)
                        return 0;
                rlen = NLMSG_ALIGN(nlh->nlmsg_len);
                if (rlen > skb->len)
                        rlen = skb->len;
                if ((err = event_recv_msg(skb, nlh))) {
                        netlink_ack(skb, nlh, -err);
                } else if (nlh->nlmsg_flags & NLM_F_ACK)
                        netlink_ack(skb, nlh, 0);
                skb_pull(skb, rlen);
        }
        return 0;
}

static void event_recv(struct sock *sk, int length)
{
        struct sk_buff *skb;

        while ((skb = skb_dequeue(&sk->sk_receive_queue))) {
                if (event_recv_skb(skb) && skb->len)
                        skb_queue_head(&sk->sk_receive_queue, skb);
                else
                        kfree_skb(skb);
        }
}

static int notify(void *data, int len, int gfp_mask)
{
        struct sk_buff *skb;
        struct nlmsghdr *nlh;
        static u32 seq = 0;

        if (!(skb = alloc_skb(NLMSG_SPACE(len), gfp_mask)))
                return -ENOMEM;

//      nlh = __nlmsg_put(skb, ietd_pid, seq++, NLMSG_DONE, len - sizeof(*nlh), 
0);
        nlh = __nlmsg_put(skb, ietd_pid, seq++, NLMSG_DONE, len - sizeof(*nlh));



        memcpy(NLMSG_DATA(nlh), data, len);

        return netlink_unicast(nl, skb, ietd_pid, 0);
}

int event_send(u32 tid, u64 sid, u32 cid, u32 state, int atomic)
{
        int err;
        struct iet_event event;

        event.tid = tid;
        event.sid = sid;
        event.cid = cid;
        event.state = state;

        err = notify(&event, NLMSG_SPACE(sizeof(struct iet_event)), 0);

        return err;
}

int event_init(void)
{
//      nl = netlink_kernel_create(NETLINK_IET, 1, event_recv, THIS_MODULE);
        nl = netlink_kernel_create(NETLINK_IET, event_recv);

        if (!nl)
                return -ENOMEM;
        else
                return 0;
}

void event_exit(void)
{
        if (nl)
                sock_release(nl->sk_socket);
}

francois.cadet.vcf
Description: Vcard