diff options
| -rw-r--r-- | datapath/datapath.c | 2 | ||||
| -rw-r--r-- | ofproto/netflow.c | 1 | ||||
| -rwxr-xr-x | xenserver/opt_xensource_libexec_interface-reconfigure | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/datapath/datapath.c b/datapath/datapath.c index ab993f6bc..e0b03d9f4 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -857,7 +857,7 @@ retry: bucket = dp_table_lookup_for_insert(table, &uf.flow.key); if (!bucket) { /* No such flow, and the slots where it could go are full. */ - error = uf.flags & ODPPF_CREATE ? -EXFULL : -ENOENT; + error = uf.flags & ODPPF_CREATE ? -EFBIG : -ENOENT; goto error; } else if (!*bucket) { /* No such flow, but we found an available slot for it. */ diff --git a/ofproto/netflow.c b/ofproto/netflow.c index 0162c45ab..7dd2e0431 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -197,7 +197,6 @@ netflow_expire(struct netflow *nf, const struct ofexpired *expired) uint16_t iface = (nf->engine_id & 0x7f) << 9; nf_rec->input = htons(iface | (expired->flow.in_port & 0x1ff)); nf_rec->output = htons(iface); - printf("input: %x\n", ntohs(nf_rec->input)); } else { nf_rec->input = htons(expired->flow.in_port); nf_rec->output = htons(0); diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure index b2d5511bb..61027c5fc 100755 --- a/xenserver/opt_xensource_libexec_interface-reconfigure +++ b/xenserver/opt_xensource_libexec_interface-reconfigure @@ -686,7 +686,7 @@ For a non-VLAN, non-bond master PIF, the PIF is its own physical device PIF. pifrec = db.get_pif_record(pif) if pifrec['VLAN'] != '-1': - return [get_vlan_slave_of_pif(pif)] + return get_physdev_pifs(get_vlan_slave_of_pif(pif)) elif len(pifrec['bond_master_of']) != 0: return get_bond_slaves_of_pif(pif) else: |