diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-24 11:29:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-24 11:29:34 +1000 |
| commit | a827924c476cbe6c692a4f048ac4afff67a09e0f (patch) | |
| tree | 5037a8d3a1468780243b93d97e52d13e62440a4d /fs | |
| parent | 676f9961c61c3fae49c6c2be0bc046d0ee6bb2cd (diff) | |
| parent | e8834a63bddf87f7b85955d1ba60d28343d88469 (diff) | |
Merge commit 'net/master'
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c index ccc9d62c462d..55ea369f43a9 100644 --- a/fs/dlm/netlink.c +++ b/fs/dlm/netlink.c @@ -63,7 +63,7 @@ static int send_data(struct sk_buff *skb) return rv; } - return genlmsg_unicast(skb, listener_nlpid); + return genlmsg_unicast(&init_net, skb, listener_nlpid); } static int user_cmd(struct sk_buff *skb, struct genl_info *info) |