summaryrefslogtreecommitdiff
path: root/drivers/net/benet
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-26 12:16:46 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-26 12:16:46 -0700
commit2bd93d7af1581d40e3c4b25242472661cb7c637a (patch)
tree43c638422d20857339d8d908d6b65ebb8045edc0 /drivers/net/benet
parent64cad2ade1e6f890531a58318ca9ee013f92ef2f (diff)
parent0972ddb2373d5e127aabdcabd8305eff0242cd0b (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to drivers/net/r8169.c changes using a patch from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
-rw-r--r--drivers/net/benet/be_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 35294005361b..7b19931acba1 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1907,6 +1907,7 @@ static void be_worker(struct work_struct *work)
}
reschedule:
+ adapter->work_counter++;
schedule_delayed_work(&adapter->work, msecs_to_jiffies(1000));
}