~james-page/ubuntu/saucy/openvswitch/1.12-snapshot

« back to all changes in this revision

Viewing changes to lib/dpif-linux.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-07-01 09:45:12 UTC
  • mfrom: (1.1.18)
  • Revision ID: package-import@ubuntu.com-20130701094512-ek6vhz212bozhtlm
Tags: 1.10.1+git20130627-0ubuntu1
* New upstream snapshot:
  - d/p/0007-tests-Tolerate-init-process-pid-1.patch: Dropped; included
    in snapshot.
  - d/p/*lacp*: Drop patches related to lacp test changes; not required
    for this series.
  - d/*: Sync relevant packaging changes.
* Provide initial support for Linux 3.10 kernel:
  - d/p/0004-datapath-Fixup-compatibility-with-linux-3.10.patch:
    Fixup compatibility with Linux 3.10; this is not full support for
    all new 3.10 features - it simply maintains compatibility for the
    existing codebase.
* d/rules: Add get-orig-snapshot target for creating snapshots from
  upstream VCS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
337
337
        return errno;
338
338
    }
339
339
 
 
340
    nl_sock_destroy(dpif->channels[port_no].sock);
340
341
    dpif->channels[port_no].sock = sock;
341
342
    dpif->channels[port_no].last_poll = LLONG_MIN;
342
343