diff for duplicates of <1466098806.17117.20.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 796d053..bc98529 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,8 +13,8 @@ On Wed, 2016-06-15 at 09:34 -0700, Venkatesh Srinivas wrote: > > > > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > > --- -> > ?drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- -> > ?1 file changed, 1 insertion(+), 1 deletion(-) +> > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- +> > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > > b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -23,15 +23,15 @@ On Wed, 2016-06-15 at 09:34 -0700, Venkatesh Srinivas wrote: > > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > > @@ -2887,7 +2887,7 @@ int ixgbe_poll(struct napi_struct *napi, int > > budget) -> > ????????if (!test_bit(__IXGBE_DOWN, &adapter->state)) -> > ????????????????ixgbe_irq_enable_queues(adapter, BIT_ULL(q_vector- +> > if (!test_bit(__IXGBE_DOWN, &adapter->state)) +> > ixgbe_irq_enable_queues(adapter, BIT_ULL(q_vector- > > >v_idx)); > > -> > -???????return 0; -> > +???????return min(work_done, budget - 1); -> > ?} +> > - return 0; +> > + return min(work_done, budget - 1); +> > } > > -> > ?/** +> > /** > Reviewed-by: Venkatesh Srinivas <venkateshs@google.com> > > The same bit of code appears in fm10k and i40e/i40evf. ixgb appears diff --git a/a/content_digest b/N1/content_digest index a258b47..3a06636 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,16 @@ "ref\037ccedd746ed932b9d73eff592f324f2a3fc6c6f.1465995724.git.pabeni@redhat.com\0" "ref\0CAHdzE-8V8o9sg9xmiJ9J0G3u=k6K-fHQssb5v09TPJvN2N=a1Q@mail.gmail.com\0" "From\0Keller, Jacob E <jacob.e.keller@intel.com>\0" - "Subject\0[Intel-wired-lan] [PATCH net] ixgbe: napi_poll must return the work done\0" + "Subject\0Re: [PATCH net] ixgbe: napi_poll must return the work done\0" "Date\0Thu, 16 Jun 2016 17:40:06 +0000\0" - "To\0intel-wired-lan@osuosl.org\0" + "To\0venkateshs@google.com <venkateshs@google.com>" + " pabeni@redhat.com <pabeni@redhat.com>\0" + "Cc\0hannes@redhat.com <hannes@redhat.com>" + netdev@vger.kernel.org <netdev@vger.kernel.org> + Kirsher + Jeffrey T <jeffrey.t.kirsher@intel.com> + intel-wired-lan@lists.osuosl.org <intel-wired-lan@lists.osuosl.org> + " davem@davemloft.net <davem@davemloft.net>\0" "\00:1\0" "b\0" "On Wed, 2016-06-15 at 09:34 -0700, Venkatesh Srinivas wrote:\n" @@ -21,8 +28,8 @@ "> > \n" "> > Signed-off-by: Paolo Abeni <pabeni@redhat.com>\n" "> > ---\n" - "> > ?drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-\n" - "> > ?1 file changed, 1 insertion(+), 1 deletion(-)\n" + "> > \302\240drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-\n" + "> > \302\2401 file changed, 1 insertion(+), 1 deletion(-)\n" "> > \n" "> > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n" "> > b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n" @@ -31,15 +38,15 @@ "> > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n" "> > @@ -2887,7 +2887,7 @@ int ixgbe_poll(struct napi_struct *napi, int\n" "> > budget)\n" - "> > ????????if (!test_bit(__IXGBE_DOWN, &adapter->state))\n" - "> > ????????????????ixgbe_irq_enable_queues(adapter, BIT_ULL(q_vector-\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (!test_bit(__IXGBE_DOWN, &adapter->state))\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240ixgbe_irq_enable_queues(adapter, BIT_ULL(q_vector-\n" "> > >v_idx));\n" "> > \n" - "> > -???????return 0;\n" - "> > +???????return min(work_done, budget - 1);\n" - "> > ?}\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240return 0;\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240return min(work_done, budget - 1);\n" + "> > \302\240}\n" "> > \n" - "> > ?/**\n" + "> > \302\240/**\n" "> Reviewed-by: Venkatesh Srinivas <venkateshs@google.com>\n" "> \n" "> The same bit of code appears in fm10k and i40e/i40evf. ixgb appears\n" @@ -66,4 +73,4 @@ "Thanks,\n" Jake -959a6885db603997803c6af5d646718ccd4e342bb4e5e9837dc74f1f23815776 +6d06b7d5e1478150af84c47c3b89ca77e6212f50ed9b60e20f2003b88815a857
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.