| Message ID | 1509412430-14216-1-git-send-email-fukaige@huawei.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] datapath: Remove redundant check for IFF_NO_QUEUE | expand |
On 10/30/2017 06:13 PM, fukaige wrote: > From: Kaige Fu <fukaige@huawei.com> > > IFF_NO_QUEUE is checked twice. This cause a situation > that HAVE_IFF_NO_QUEUE is defined no matter whether > the flag IFF_NO_QUEUE is defined in kernel or not. > > Signed-off-by: Kaige Fu <fukaige@huawei.com> > --- > datapath/linux/compat/include/linux/netdevice.h | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h > index a5d4ee8..3c3cf42 100644 > --- a/datapath/linux/compat/include/linux/netdevice.h > +++ b/datapath/linux/compat/include/linux/netdevice.h > @@ -22,9 +22,6 @@ struct net; > #define IFF_LIVE_ADDR_CHANGE 0 > #endif > > -#ifndef IFF_NO_QUEUE > -#define IFF_NO_QUEUE 0 > -#endif > #ifndef IFF_OPENVSWITCH > #define IFF_OPENVSWITCH 0 > #endif > Looks correct to me. Reviewed-by: Greg Rose <gvrose8192@gmail.com>
On Wed, Nov 01, 2017 at 08:43:20AM -0700, Greg Rose wrote: > On 10/30/2017 06:13 PM, fukaige wrote: > >From: Kaige Fu <fukaige@huawei.com> > > > >IFF_NO_QUEUE is checked twice. This cause a situation > >that HAVE_IFF_NO_QUEUE is defined no matter whether > >the flag IFF_NO_QUEUE is defined in kernel or not. > > > >Signed-off-by: Kaige Fu <fukaige@huawei.com> > >--- > > datapath/linux/compat/include/linux/netdevice.h | 3 --- > > 1 file changed, 3 deletions(-) > > > >diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h > >index a5d4ee8..3c3cf42 100644 > >--- a/datapath/linux/compat/include/linux/netdevice.h > >+++ b/datapath/linux/compat/include/linux/netdevice.h > >@@ -22,9 +22,6 @@ struct net; > > #define IFF_LIVE_ADDR_CHANGE 0 > > #endif > >-#ifndef IFF_NO_QUEUE > >-#define IFF_NO_QUEUE 0 > >-#endif > > #ifndef IFF_OPENVSWITCH > > #define IFF_OPENVSWITCH 0 > > #endif > > > > Looks correct to me. > > Reviewed-by: Greg Rose <gvrose8192@gmail.com> Thanks Kaige and Greg. I applied this to master. Let me know if it should be backported.
On 2017/11/2 4:19, Ben Pfaff wrote: > On Wed, Nov 01, 2017 at 08:43:20AM -0700, Greg Rose wrote: >> On 10/30/2017 06:13 PM, fukaige wrote: >>> From: Kaige Fu <fukaige@huawei.com> >>> >>> IFF_NO_QUEUE is checked twice. This cause a situation >>> that HAVE_IFF_NO_QUEUE is defined no matter whether >>> the flag IFF_NO_QUEUE is defined in kernel or not. >>> >>> Signed-off-by: Kaige Fu <fukaige@huawei.com> >>> --- >>> datapath/linux/compat/include/linux/netdevice.h | 3 --- >>> 1 file changed, 3 deletions(-) >>> >>> diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h >>> index a5d4ee8..3c3cf42 100644 >>> --- a/datapath/linux/compat/include/linux/netdevice.h >>> +++ b/datapath/linux/compat/include/linux/netdevice.h >>> @@ -22,9 +22,6 @@ struct net; >>> #define IFF_LIVE_ADDR_CHANGE 0 >>> #endif >>> -#ifndef IFF_NO_QUEUE >>> -#define IFF_NO_QUEUE 0 >>> -#endif >>> #ifndef IFF_OPENVSWITCH >>> #define IFF_OPENVSWITCH 0 >>> #endif >>> >> Looks correct to me. >> >> Reviewed-by: Greg Rose <gvrose8192@gmail.com> > Thanks Kaige and Greg. I applied this to master. Let me know if it > should be backported. > > . Thanks for applying this patch. It should be backported to branch-2.8/branch-2.7/branch-2.6.
On Thu, Nov 02, 2017 at 08:51:59AM +0800, Kaige Fu wrote: > On 2017/11/2 4:19, Ben Pfaff wrote: > > On Wed, Nov 01, 2017 at 08:43:20AM -0700, Greg Rose wrote: > >> On 10/30/2017 06:13 PM, fukaige wrote: > >>> From: Kaige Fu <fukaige@huawei.com> > >>> > >>> IFF_NO_QUEUE is checked twice. This cause a situation > >>> that HAVE_IFF_NO_QUEUE is defined no matter whether > >>> the flag IFF_NO_QUEUE is defined in kernel or not. > >>> > >>> Signed-off-by: Kaige Fu <fukaige@huawei.com> > >>> --- > >>> datapath/linux/compat/include/linux/netdevice.h | 3 --- > >>> 1 file changed, 3 deletions(-) > >>> > >>> diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h > >>> index a5d4ee8..3c3cf42 100644 > >>> --- a/datapath/linux/compat/include/linux/netdevice.h > >>> +++ b/datapath/linux/compat/include/linux/netdevice.h > >>> @@ -22,9 +22,6 @@ struct net; > >>> #define IFF_LIVE_ADDR_CHANGE 0 > >>> #endif > >>> -#ifndef IFF_NO_QUEUE > >>> -#define IFF_NO_QUEUE 0 > >>> -#endif > >>> #ifndef IFF_OPENVSWITCH > >>> #define IFF_OPENVSWITCH 0 > >>> #endif > >>> > >> Looks correct to me. > >> > >> Reviewed-by: Greg Rose <gvrose8192@gmail.com> > > Thanks Kaige and Greg. I applied this to master. Let me know if it > > should be backported. > > > > . > > Thanks for applying this patch. It should be backported to branch-2.8/branch-2.7/branch-2.6. Thanks for the advice. These backports are done now.
diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h index a5d4ee8..3c3cf42 100644 --- a/datapath/linux/compat/include/linux/netdevice.h +++ b/datapath/linux/compat/include/linux/netdevice.h @@ -22,9 +22,6 @@ struct net; #define IFF_LIVE_ADDR_CHANGE 0 #endif -#ifndef IFF_NO_QUEUE -#define IFF_NO_QUEUE 0 -#endif #ifndef IFF_OPENVSWITCH #define IFF_OPENVSWITCH 0 #endif