Commit 2136aec5 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents d9fa46bf 17411451
......@@ -1693,7 +1693,8 @@ PlayFrisbee(void)
p->msg.join2.chunksize = MAXCHUNKSIZE;
p->msg.join2.blocksize = MAXBLOCKSIZE;
p->msg.join2.bytecount =
p->msg.join.blockcount * MAXBLOCKSIZE;
(uint64_t)p->msg.join.blockcount *
MAXBLOCKSIZE;
}
CLEVENT(1, EV_CLIJOINREP,
CHUNKSIZE, BLOCKSIZE,
......
......@@ -290,7 +290,7 @@ typedef struct {
int32_t blockcount;
int32_t chunksize;
int32_t blocksize;
int64_t bytecount;
uint64_t bytecount;
} join2;
/*
......
......@@ -5512,8 +5512,8 @@ sub InterpLinksAux($)
$protolink->SetType((defined($protovlan) ?
"emulated" : "vlan"));
$protolink->SetRole("link/lan");
$protovlan->SetAttribute("link/lan", $lan)
if (!defined($protolan));
$protolink->SetAttribute("link/lan", $lan)
if (!defined($protovlan));
$protolink->AddInterface($nodeA, $vnodeA, $vportA,
$virtifaceA->viface(),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment