Message ID | 1444154401-18029-2-git-send-email-joestringer@nicira.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On 10/6/2015 8:59 PM, Joe Stringer wrote: > These comments hadn't caught up to their implementations, fix them. > > Fixes: 7f8a436eaa2c "openvswitch: Add conntrack action" Sigh. Please see Documentation/SubmittingPatches. It should be: Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action") > Signed-off-by: Joe Stringer <joestringer@nicira.com> > Acked-by: Pravin B Shelar <pshelar@nicira.com> MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 7 October 2015 at 06:33, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > On 10/6/2015 8:59 PM, Joe Stringer wrote: > >> These comments hadn't caught up to their implementations, fix them. >> >> Fixes: 7f8a436eaa2c "openvswitch: Add conntrack action" > > > Sigh. Please see Documentation/SubmittingPatches. It should be: > > Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action") Sorry about that. I've amended my gitconfig to avoid this in future. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index c736344afed4..a9a4a59912e9 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -630,7 +630,7 @@ struct ovs_action_hash { */ enum ovs_ct_attr { OVS_CT_ATTR_UNSPEC, - OVS_CT_ATTR_FLAGS, /* u8 bitmask of OVS_CT_F_*. */ + OVS_CT_ATTR_FLAGS, /* u32 bitmask of OVS_CT_F_*. */ OVS_CT_ATTR_ZONE, /* u16 zone id. */ OVS_CT_ATTR_MARK, /* mark to associate with this connection. */ OVS_CT_ATTR_LABELS, /* labels to associate with this connection. */ @@ -705,7 +705,7 @@ enum ovs_action_attr { * data immediately followed by a mask. * The data must be zero for the unmasked * bits. */ - OVS_ACTION_ATTR_CT, /* One nested OVS_CT_ATTR_* . */ + OVS_ACTION_ATTR_CT, /* Nested OVS_CT_ATTR_* . */ __OVS_ACTION_ATTR_MAX, /* Nothing past this will be accepted * from userspace. */