git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[NET]: Make the device list and device lookups per namespace.
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ifb.c
diff --git
a/drivers/net/ifb.c
b/drivers/net/ifb.c
index
f5c3598
..
b06c6db
100644
(file)
--- a/
drivers/net/ifb.c
+++ b/
drivers/net/ifb.c
@@
-34,6
+34,7
@@
#include <linux/init.h>
#include <linux/moduleparam.h>
#include <net/pkt_sched.h>
#include <linux/init.h>
#include <linux/moduleparam.h>
#include <net/pkt_sched.h>
+#include <net/net_namespace.h>
#define TX_TIMEOUT (2*HZ)
#define TX_TIMEOUT (2*HZ)
@@
-97,7
+98,7
@@
static void ri_tasklet(unsigned long dev)
stats->tx_packets++;
stats->tx_bytes +=skb->len;
stats->tx_packets++;
stats->tx_bytes +=skb->len;
- skb->dev = __dev_get_by_index(skb->iif);
+ skb->dev = __dev_get_by_index(
&init_net,
skb->iif);
if (!skb->dev) {
dev_kfree_skb(skb);
stats->tx_dropped++;
if (!skb->dev) {
dev_kfree_skb(skb);
stats->tx_dropped++;