git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master'
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ifb.c
diff --git
a/drivers/net/ifb.c
b/drivers/net/ifb.c
index 1b699259b4ec47fda9f9b7605078b97890fb1dbe..31fb2d75dc447a79bffa71f86d728425b68472a1 100644
(file)
--- a/
drivers/net/ifb.c
+++ b/
drivers/net/ifb.c
@@
-57,7
+57,7
@@
struct ifb_private {
struct sk_buff_head tq;
};
-static int numifbs =
1
;
+static int numifbs =
2
;
static void ri_tasklet(unsigned long dev);
static int ifb_xmit(struct sk_buff *skb, struct net_device *dev);