Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-27 Thread Justin Pettit
> What if we do both that and write #include "lib/vswitch-idl.h" instead > of plain #include "vswitch-idl.h" for a while? I often don't run "make > clean" when switching branches and, really, I shouldn't have to. Sounds reasonable to me. Do you mind handling it? Thanks! --Justin _

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-26 Thread Ben Pfaff
On Mon, Mar 26, 2012 at 06:02:32PM -0700, Justin Pettit wrote: > On Mar 26, 2012, at 3:42 PM, Ben Pfaff wrote: > > > On Fri, Mar 23, 2012 at 11:20:17PM -0700, Justin Pettit wrote: > >> By the way, when Mehak and I were resolving the conflicts, we found > >> that Ethan's IDL changes caused a somewh

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-26 Thread Justin Pettit
On Mar 26, 2012, at 3:42 PM, Ben Pfaff wrote: > On Fri, Mar 23, 2012 at 11:20:17PM -0700, Justin Pettit wrote: >> By the way, when Mehak and I were resolving the conflicts, we found >> that Ethan's IDL changes caused a somewhat subtle issue. The >> "vswitch-idl.{c|h}" files were sticking around in

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-26 Thread Ethan Jackson
> I don't understand this description.  What's a preference? I think what he's saying is that they updated to the new code which moved the IDL into libopenvswitch, but they didn't do a make clean so the old idl was still getting linked into ovs-vswitchd. The code was making calls which preferred

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-26 Thread Ben Pfaff
On Fri, Mar 23, 2012 at 11:20:17PM -0700, Justin Pettit wrote: > By the way, when Mehak and I were resolving the conflicts, we found > that Ethan's IDL changes caused a somewhat subtle issue. The > "vswitch-idl.{c|h}" files were sticking around in the "vswitchd" > directory, which has a higher pref

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Mehak Mahajan
Thanks Ben, Justin. I just pushed the changes to master. thanx! mehak On Fri, Mar 23, 2012 at 11:20 PM, Justin Pettit wrote: > On Mar 23, 2012, at 6:32 PM, Ben Pfaff wrote: > > > On Fri, Mar 23, 2012 at 06:12:00PM -0700, Mehak Mahajan wrote: > >> Ethan's change caused a merge conflict for brid

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Justin Pettit
On Mar 23, 2012, at 6:32 PM, Ben Pfaff wrote: > On Fri, Mar 23, 2012 at 06:12:00PM -0700, Mehak Mahajan wrote: >> Ethan's change caused a merge conflict for bridge.c .. I have made some >> more incremental changes to the existing patch. >> Does it look good? > > Yes, that's what I'd expect. By

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Ben Pfaff
On Fri, Mar 23, 2012 at 06:12:00PM -0700, Mehak Mahajan wrote: > Ethan's change caused a merge conflict for bridge.c .. I have made some > more incremental changes to the existing patch. > Does it look good? Yes, that's what I'd expect. Thanks, Ben. __

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Mehak Mahajan
Hi, Ethan's change caused a merge conflict for bridge.c .. I have made some more incremental changes to the existing patch. Does it look good? diff --cc vswitchd/bridge.c index 2ea146c,56203b9..000 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@@ -215,7 -219,15 +215,6 @@@ static void i

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Ben Pfaff
On Fri, Mar 23, 2012 at 03:49:44PM -0700, Mehak Mahajan wrote: > The changes allow the user to specify a separate dscp value for the > controller connection and the manager connection. The value will take > effect on resetting the connections. If no value is specified a default > value of 192 is ch

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Ben Pfaff
Sounds good, thank you On Fri, Mar 23, 2012 at 02:36:48PM -0700, Mehak Mahajan wrote: > Thanks Ben. I will make the changes to emacs ... > > My Bad. The structure was ofservice. I have added a dscp member to > ofservice and as you mentioned, I am writing the value of dscp from struct > ofproto_co

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Mehak Mahajan
Thanks Ben. I will make the changes to emacs ... My Bad. The structure was ofservice. I have added a dscp member to ofservice and as you mentioned, I am writing the value of dscp from struct ofproto_controller to struct ofservice in ofservice_reconfigure(). Then reading the dscp value in connmgr_r

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Ben Pfaff
On Fri, Mar 23, 2012 at 02:13:32PM -0700, Mehak Mahajan wrote: > Done ... Hopefully this is the last set of whitespaces :) You can make Emacs highlight trailing whitespace by adding: (add-hook 'c-mode-hook (lambda () (setq show-trailing-whitespace t))) to your .emacs. > > We should mention th

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Mehak Mahajan
Hi Ben, Thanks for your comments. Please find my questions/comments inline. On Fri, Mar 23, 2012 at 1:25 PM, Ben Pfaff wrote: > On Thu, Mar 22, 2012 at 10:24:33PM -0700, Mehak Mahajan wrote: > > The changes allow the user to specify a separate dscp value for the > > controller connection and t

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-23 Thread Ben Pfaff
On Thu, Mar 22, 2012 at 10:24:33PM -0700, Mehak Mahajan wrote: > The changes allow the user to specify a separate dscp value for the > controller connection and the manager connection. The value will take > effect on resetting the connections. If no value is specified a default > value of 192 is ch

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-22 Thread Ben Pfaff
Thanks so much. That was a really fast turnaround. On Thu, Mar 22, 2012 at 03:56:00PM -0700, Mehak Mahajan wrote: > The changes allow the user to specify a separate dscp value for the > controller connection and the manager connection. The value will take > effect on resetting the connections. If

Re: [ovs-dev] [PATCH] Allow configuring DSCP on controller and manager connections.

2012-03-22 Thread Ben Pfaff
Thank you for implementing this feature! On Tue, Mar 20, 2012 at 01:35:02PM -0700, Mehak Mahajan wrote: > From: root To get rid of this, run git commit --amend --author='Mehak Mahajan ' and then exit the editor that it invokes to allow you to edit the commit message. > The changes allo