diff options
| author | Ethan Jackson <ethan@nicira.com> | 2011-08-04 16:50:25 -0700 |
|---|---|---|
| committer | Ethan Jackson <ethan@nicira.com> | 2011-08-12 15:05:41 -0700 |
| commit | b53055f4da4f8de17c591ae07ddd782829d21cd8 (patch) | |
| tree | fbccfb390adc05b613277388c4409a5948c1a82c /ofproto | |
| parent | 72f7976600581cc9c57915dad150f7984c33e18b (diff) | |
| download | openvswitch-b53055f4da4f8de17c591ae07ddd782829d21cd8.tar.gz | |
lib: Whitespace cleanup.
Diffstat (limited to 'ofproto')
| -rw-r--r-- | ofproto/netflow.c | 2 | ||||
| -rw-r--r-- | ofproto/ofproto-dpif.c | 6 | ||||
| -rw-r--r-- | ofproto/ofproto.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ofproto/netflow.c b/ofproto/netflow.c index 381ff8efc..f0af436d1 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -104,7 +104,7 @@ struct netflow { static void gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow, - struct ofexpired *expired, + struct ofexpired *expired, uint32_t packet_count, uint32_t byte_count) { struct netflow_v5_header *nf_hdr; diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index f53cc430a..010d98b42 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1397,7 +1397,7 @@ is_mirror_output_bundle(struct ofproto *ofproto_, void *aux) } static void -forward_bpdu_changed(struct ofproto *ofproto_) +forward_bpdu_changed(struct ofproto *ofproto_) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); /* Revalidate cached flows whenever forward_bpdu option changes. */ @@ -3777,9 +3777,9 @@ is_admissible(struct ofproto_dpif *ofproto, const struct flow *flow, return false; } - /* Drop frames for reserved multicast addresses + /* Drop frames for reserved multicast addresses * only if forward_bpdu option is absent. */ - if (eth_addr_is_reserved(flow->dl_dst) && + if (eth_addr_is_reserved(flow->dl_dst) && !ofproto->up.forward_bpdu) { return false; } diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 6fd2369d4..849a376ae 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -430,7 +430,7 @@ ofproto_set_flow_eviction_threshold(struct ofproto *ofproto, unsigned threshold) } } -/* If forward_bpdu is true, the NORMAL action will forward frames with +/* If forward_bpdu is true, the NORMAL action will forward frames with * reserved (e.g. STP) destination Ethernet addresses. if forward_bpdu is false, * the NORMAL action will drop these frames. */ void @@ -442,7 +442,7 @@ ofproto_set_forward_bpdu(struct ofproto *ofproto, bool forward_bpdu) if (ofproto->ofproto_class->forward_bpdu_changed) { ofproto->ofproto_class->forward_bpdu_changed(ofproto); } - } + } } void |