← Back to branch summary

~ubuntu-branches/ubuntu/trusty/openvswitch/trusty-updates

« back to all changes in this revision

Viewing changes to lib/meta-flow.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-02-07 15:32:38 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20130207153238-4fw3p72zc0ms1g8p
Tags: 1.9.0~git20130207.84b39f2-0ubuntu1
https://launchpad.net/bugs/1098324
* New upstream snapshot from 1.9 branch:
  - d/p/support-linux-3.8.patch,
    d/p/linux-Makefile.main.in-acinclude-preparation-for-lin.patch:
    Dropped as included upstream.
* Fix dependencies for ovsdbmonitor (LP: #1098324):
  - d/control: Add dependency on python-twisted-conch.
* d/control: Bumped Standards-Version, no changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/meta-flow.c
1453
1453
 
1454
1454
    case MFF_METADATA:
1455
1455
        match_set_metadata_masked(match, htonll(0), htonll(0));
 
1456
        break;
1456
1457
 
1457
1458
    case MFF_IN_PORT:
1458
1459
        match->flow.in_port = 0;
2243
2244
}
2244
2245
 
2245
2246
static void
2246
 
mf_format_frag_string(const uint8_t *valuep, const uint8_t *maskp,
2247
 
                      struct ds *s)
 
2247
mf_format_frag_string(uint8_t value, uint8_t mask, struct ds *s)
2248
2248
{
2249
2249
    const struct frag_handling *h;
2250
 
    uint8_t value = *valuep;
2251
 
    uint8_t mask = *maskp;
2252
2250
 
 
2251
    mask &= FLOW_NW_FRAG_MASK;
2253
2252
    value &= mask;
2254
 
    mask &= FLOW_NW_FRAG_MASK;
2255
2253
 
2256
2254
    for (h = all_frags; h < &all_frags[ARRAY_SIZE(all_frags)]; h++) {
2257
2255
        if (value == h->value && mask == h->mask) {
2310
2308
        break;
2311
2309
 
2312
2310
    case MFS_FRAG:
2313
 
        mf_format_frag_string(&value->u8, &mask->u8, s);
 
2311
        mf_format_frag_string(value->u8, mask ? mask->u8 : UINT8_MAX, s);
2314
2312
        break;
2315
2313
 
2316
2314
    case MFS_TNL_FLAGS: