]> git.pld-linux.org Git - packages/kernel.git/blob - kernel-vserver-inet_diag.patch
- fix netlink (inet_diag) inside vservers
[packages/kernel.git] / kernel-vserver-inet_diag.patch
1 --- linux-2.6.22.19/net/ipv4/inet_diag.c~       2008-02-28 15:12:43.635402618 +0100
2 +++ linux-2.6.22.19/net/ipv4/inet_diag.c        2008-03-04 13:30:30.423644777 +0100
3 @@ -98,8 +98,8 @@
4  
5         r->id.idiag_sport = inet->sport;
6         r->id.idiag_dport = inet->dport;
7 -       r->id.idiag_src[0] = nx_map_sock_lback(skb->sk->sk_nx_info, inet->rcv_saddr);
8 -       r->id.idiag_dst[0] = nx_map_sock_lback(skb->sk->sk_nx_info, inet->daddr);
9 +       r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, inet->rcv_saddr);
10 +       r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, inet->daddr);
11  
12  #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
13         if (r->idiag_family == AF_INET6) {
14 @@ -563,8 +563,8 @@
15  
16         r->id.idiag_sport = inet->sport;
17         r->id.idiag_dport = ireq->rmt_port;
18 -       r->id.idiag_src[0] = nx_map_sock_lback(skb->sk->sk_nx_info, ireq->loc_addr);
19 -       r->id.idiag_dst[0] = nx_map_sock_lback(skb->sk->sk_nx_info, ireq->rmt_addr);
20 +       r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->loc_addr);
21 +       r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->rmt_addr);
22         r->idiag_expires = jiffies_to_msecs(tmo);
23         r->idiag_rqueue = 0;
24         r->idiag_wqueue = 0;
This page took 0.038036 seconds and 3 git commands to generate.