| Message ID | 1351980150-24145-10-git-send-email-lee.jones@linaro.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Lee Jones <lee.jones@linaro.org> Date: Sat, 3 Nov 2012 23:02:30 +0100 > Instead of issuing (0) statements when !CONFIG_SYSFS which will cause > 'warning: ', we'll use inline statements instead. This will effectively > do the same thing, but suppress any unnecessary warnings. > > Cc: Stephen Hemminger <shemminger@vyatta.com> > Cc: bridge@lists.linux-foundation.org > Cc: netdev@vger.kernel.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Applied, but please use more informative subject lines. You should prefix your subject line after [PATCH ...] with the name of the subsystem you are touching, a ": " then the headline description. So here you would have used "bridge: " and that's what I added when I commited this patch. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, 04 Nov 2012, David Miller wrote: > From: Lee Jones <lee.jones@linaro.org> > Date: Sat, 3 Nov 2012 23:02:30 +0100 > > > Instead of issuing (0) statements when !CONFIG_SYSFS which will cause > > 'warning: ', we'll use inline statements instead. This will effectively > > do the same thing, but suppress any unnecessary warnings. > > > > Cc: Stephen Hemminger <shemminger@vyatta.com> > > Cc: bridge@lists.linux-foundation.org > > Cc: netdev@vger.kernel.org > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > Applied, but please use more informative subject lines. > > You should prefix your subject line after [PATCH ...] with > the name of the subsystem you are touching, a ": " then > the headline description. > > So here you would have used "bridge: " and that's what I added when I > commited this patch. Yes, of course I should have done, and usually do. This was an oversight, sorry about that.
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 9b278c4..af5f584 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -566,10 +566,10 @@ extern void br_sysfs_delbr(struct net_device *dev); #else -#define br_sysfs_addif(p) (0) -#define br_sysfs_renameif(p) (0) -#define br_sysfs_addbr(dev) (0) -#define br_sysfs_delbr(dev) do { } while(0) +static inline int br_sysfs_addif(struct net_bridge_port *p) { return 0; } +static inline int br_sysfs_renameif(struct net_bridge_port *p) { return 0; } +static inline int br_sysfs_addbr(struct net_device *dev) { return 0; } +static inline void br_sysfs_delbr(struct net_device *dev) { return; } #endif /* CONFIG_SYSFS */ #endif
Instead of issuing (0) statements when !CONFIG_SYSFS which will cause 'warning: ', we'll use inline statements instead. This will effectively do the same thing, but suppress any unnecessary warnings. Cc: Stephen Hemminger <shemminger@vyatta.com> Cc: bridge@lists.linux-foundation.org Cc: netdev@vger.kernel.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- net/bridge/br_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)