summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/netlink/netlink_dev.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/netlink/netlink_dev.c b/net/netlink/netlink_dev.c
index 813e6431d83a..12b8008adc42 100644
--- a/net/netlink/netlink_dev.c
+++ b/net/netlink/netlink_dev.c
@@ -41,7 +41,7 @@ static struct socket *netlink_user[MAX_LINKS];
static unsigned int netlink_poll(struct file *file, poll_table * wait)
{
- struct socket *sock = netlink_user[minor(file->f_dentry->d_inode->i_rdev)];
+ struct socket *sock = netlink_user[iminor(file->f_dentry->d_inode)];
if (sock->ops->poll==NULL)
return 0;
@@ -56,7 +56,7 @@ static ssize_t netlink_write(struct file * file, const char * buf,
size_t count, loff_t *pos)
{
struct inode *inode = file->f_dentry->d_inode;
- struct socket *sock = netlink_user[minor(inode->i_rdev)];
+ struct socket *sock = netlink_user[iminor(inode)];
struct msghdr msg;
struct iovec iov;
@@ -80,7 +80,7 @@ static ssize_t netlink_read(struct file * file, char * buf,
size_t count, loff_t *pos)
{
struct inode *inode = file->f_dentry->d_inode;
- struct socket *sock = netlink_user[minor(inode->i_rdev)];
+ struct socket *sock = netlink_user[iminor(inode)];
struct msghdr msg;
struct iovec iov;
@@ -100,7 +100,7 @@ static ssize_t netlink_read(struct file * file, char * buf,
static int netlink_open(struct inode * inode, struct file * file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct socket *sock;
struct sockaddr_nl nladdr;
int err;
@@ -132,7 +132,7 @@ out:
static int netlink_release(struct inode * inode, struct file * file)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
struct socket *sock;
sock = netlink_user[minor];
@@ -146,7 +146,7 @@ static int netlink_release(struct inode * inode, struct file * file)
static int netlink_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
- unsigned int minor = minor(inode->i_rdev);
+ unsigned int minor = iminor(inode);
int retval = 0;
if (minor >= MAX_LINKS)