diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /include/net/pkt_cls.h | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'include/net/pkt_cls.h')
| -rw-r--r-- | include/net/pkt_cls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index d349c66ef828..aa9e282db485 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h | |||
| @@ -353,7 +353,7 @@ tcf_match_indev(struct sk_buff *skb, char *indev) | |||
| 353 | if (indev[0]) { | 353 | if (indev[0]) { |
| 354 | if (!skb->iif) | 354 | if (!skb->iif) |
| 355 | return 0; | 355 | return 0; |
| 356 | dev = __dev_get_by_index(&init_net, skb->iif); | 356 | dev = __dev_get_by_index(dev_net(skb->dev), skb->iif); |
| 357 | if (!dev || strcmp(indev, dev->name)) | 357 | if (!dev || strcmp(indev, dev->name)) |
| 358 | return 0; | 358 | return 0; |
| 359 | } | 359 | } |