From 6c5cc2bfee633dcbdfe6beb336e6841ddf0e9ec0 Mon Sep 17 00:00:00 2001 From: Bob Lantz Date: Fri, 23 Apr 2010 15:08:30 -0700 Subject: [PATCH] Fix malformed patch format. For some reason, the leading spaces were missing. --- util/openflow-patches/datapath.patch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/util/openflow-patches/datapath.patch b/util/openflow-patches/datapath.patch index 019b60e..13c9df7 100644 --- a/util/openflow-patches/datapath.patch +++ b/util/openflow-patches/datapath.patch @@ -3,24 +3,24 @@ index 4a4d3a2..365aa25 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -47,6 +47,9 @@ - -#include "compat.h" - + + #include "compat.h" + +#ifdef CONFIG_NET_NS +#include +#endif - -/* Strings to describe the manufacturer, hardware, and software. This data - * is queriable through the switch description stats message. */ -@@ -259,7 +262,11 @@ send_openflow_skb(const struct datapath *dp, - struct sk_buff *skb, const struct sender *sender) -{ - return (sender + + /* Strings to describe the manufacturer, hardware, and software. This data + * is queriable through the switch description stats message. */ +@@ -259,6 +262,10 @@ send_openflow_skb(const struct datapath *dp, + struct sk_buff *skb, const struct sender *sender) + { + return (sender - ? genlmsg_unicast(skb, sender->pid) +#ifdef CONFIG_NET_NS + ? genlmsg_unicast(&init_net, skb, sender->pid) +#else + ? genlmsg_unicast(skb, sender->pid) +#endif - : genlmsg_multicast(skb, 0, dp_mc_group(dp), GFP_ATOMIC)); -} + : genlmsg_multicast(skb, 0, dp_mc_group(dp), GFP_ATOMIC)); + }