| Message ID | 20180706124420.3129099-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 000244d3dc1f8114e38fe9ee2d9a0986404d9cbe |
| Headers | show |
| Series | [net] net: bridge: fix br_vlan_get_{pvid,info} return values | expand |
On 06/07/18 15:44, Arnd Bergmann wrote: > These two functions return the regular -EINVAL failure in the normal > code path, but return a nonstandard '-1' error otherwise, which gets > interpreted as -EPERM. > > Let's change it to -EINVAL for the dummy functions as well. > > Fixes: 4d4fd36126d6 ("net: bridge: Publish bridge accessor functions") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > include/linux/if_bridge.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h > index 7843b98e1c6e..c20c7e197d07 100644 > --- a/include/linux/if_bridge.h > +++ b/include/linux/if_bridge.h > @@ -105,13 +105,13 @@ static inline bool br_vlan_enabled(const struct net_device *dev) > > static inline int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid) > { > - return -1; > + return -EINVAL; > } > > static inline int br_vlan_get_info(const struct net_device *dev, u16 vid, > struct bridge_vlan_info *p_vinfo) > { > - return -1; > + return -EINVAL; > } > #endif > > Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
From: Arnd Bergmann <arnd@arndb.de> Date: Fri, 6 Jul 2018 14:44:02 +0200 > These two functions return the regular -EINVAL failure in the normal > code path, but return a nonstandard '-1' error otherwise, which gets > interpreted as -EPERM. > > Let's change it to -EINVAL for the dummy functions as well. > > Fixes: 4d4fd36126d6 ("net: bridge: Publish bridge accessor functions") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied, thanks Arnd.
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 7843b98e1c6e..c20c7e197d07 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -105,13 +105,13 @@ static inline bool br_vlan_enabled(const struct net_device *dev) static inline int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid) { - return -1; + return -EINVAL; } static inline int br_vlan_get_info(const struct net_device *dev, u16 vid, struct bridge_vlan_info *p_vinfo) { - return -1; + return -EINVAL; } #endif
These two functions return the regular -EINVAL failure in the normal code path, but return a nonstandard '-1' error otherwise, which gets interpreted as -EPERM. Let's change it to -EINVAL for the dummy functions as well. Fixes: 4d4fd36126d6 ("net: bridge: Publish bridge accessor functions") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/linux/if_bridge.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0