History

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. ====================

David S. Miller committed 13 years ago

Commit 09ce0692 parents 948e306 93d8fd110 files · +51 −37Browse files

Showing the changes to include/uapi/linux (1 of 10 files). Show all

Unified · Split

include/uapi/linux/openvswitch.h+0−1
@@ -192,7 +192,6 @@ enum ovs_vport_type { · 191 unmodified lines
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 type193 * 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 to196 * 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 &struct197 * look up the vport to operate on; otherwise dp_idx from the &struct

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t