diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-14 18:31:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-14 18:31:22 -0400 |
| commit | 09ce069dff607f86dcdeb541d20734a8f42478c5 (patch) | |
| tree | 03c7e9dc78d4dbfc2b3687053bbbd1680789934d /include/uapi | |
| parent | 948e306d7d645af80ea331b60495710fe4fe12bb (diff) | |
| parent | 93d8fd1514b6862c3370ea92be3f3b4216e0bf8f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
A few miscellaneous improvements and cleanups before the GRE tunnel
integration series. Intended for net-next/3.11.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/openvswitch.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index 405918dd7b3f..424672db7f12 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h | |||
| @@ -192,7 +192,6 @@ enum ovs_vport_type { | |||
| 192 | * optional; if not specified a free port number is automatically selected. | 192 | * optional; if not specified a free port number is automatically selected. |
| 193 | * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type | 193 | * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type |
| 194 | * of vport. | 194 | * of vport. |
| 195 | * and other attributes are ignored. | ||
| 196 | * | 195 | * |
| 197 | * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to | 196 | * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to |
| 198 | * look up the vport to operate on; otherwise dp_idx from the &struct | 197 | * look up the vport to operate on; otherwise dp_idx from the &struct |