diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:20:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:20:11 -0400 |
| commit | f7402dc44d617be807e7184c6c624611b2d35b4e (patch) | |
| tree | 1df6e5877ee3083838c7956285a5966d78d0646f /net/packet | |
| parent | e72225d160a2529d6ce6d5898a267f7dae02aa6e (diff) | |
| parent | 832079d29a781ddf89467662ab4b540f0c1e668a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index ba997095f08f..8690f171c1ef 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
| @@ -1535,8 +1535,7 @@ static unsigned int packet_poll(struct file * file, struct socket *sock, | |||
| 1535 | static void packet_mm_open(struct vm_area_struct *vma) | 1535 | static void packet_mm_open(struct vm_area_struct *vma) |
| 1536 | { | 1536 | { |
| 1537 | struct file *file = vma->vm_file; | 1537 | struct file *file = vma->vm_file; |
| 1538 | struct inode *inode = file->f_dentry->d_inode; | 1538 | struct socket * sock = file->private_data; |
| 1539 | struct socket * sock = SOCKET_I(inode); | ||
| 1540 | struct sock *sk = sock->sk; | 1539 | struct sock *sk = sock->sk; |
| 1541 | 1540 | ||
| 1542 | if (sk) | 1541 | if (sk) |
| @@ -1546,8 +1545,7 @@ static void packet_mm_open(struct vm_area_struct *vma) | |||
| 1546 | static void packet_mm_close(struct vm_area_struct *vma) | 1545 | static void packet_mm_close(struct vm_area_struct *vma) |
| 1547 | { | 1546 | { |
| 1548 | struct file *file = vma->vm_file; | 1547 | struct file *file = vma->vm_file; |
| 1549 | struct inode *inode = file->f_dentry->d_inode; | 1548 | struct socket * sock = file->private_data; |
| 1550 | struct socket * sock = SOCKET_I(inode); | ||
| 1551 | struct sock *sk = sock->sk; | 1549 | struct sock *sk = sock->sk; |
| 1552 | 1550 | ||
| 1553 | if (sk) | 1551 | if (sk) |