diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-03-24 15:31:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-24 15:31:00 -0700 |
| commit | cb84663e4d239f23f0d872bc6463c272e74daad8 (patch) | |
| tree | f3153fbf15585870f98f261606df014b8780a548 /net/ipv4/ip_fragment.c | |
| parent | 7a6adb92fe301c10ca4dbd0d9f2422f5880595e7 (diff) | |
| download | kernel_samsung_aries-cb84663e4d239f23f0d872bc6463c272e74daad8.zip kernel_samsung_aries-cb84663e4d239f23f0d872bc6463c272e74daad8.tar.gz kernel_samsung_aries-cb84663e4d239f23f0d872bc6463c272e74daad8.tar.bz2 | |
[NETNS]: Process IP layer in the context of the correct namespace.
Replace all the rest of the init_net with a proper net on the IP layer.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_fragment.c')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 3b2e5ad..8b448c4 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -204,8 +204,11 @@ static void ip_expire(unsigned long arg) if ((qp->q.last_in&FIRST_IN) && qp->q.fragments != NULL) { struct sk_buff *head = qp->q.fragments; + struct net *net; + + net = container_of(qp->q.net, struct net, ipv4.frags); /* Send an ICMP "Fragment Reassembly Timeout" message. */ - if ((head->dev = dev_get_by_index(&init_net, qp->iif)) != NULL) { + if ((head->dev = dev_get_by_index(net, qp->iif)) != NULL) { icmp_send(head, ICMP_TIME_EXCEEDED, ICMP_EXC_FRAGTIME, 0); dev_put(head->dev); } |