From 4ce428eeec34a3a8a62f7f9c2e6dcbcffcf8b1e2 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Sat, 3 Nov 2012 23:02:30 +0100 Subject: [PATCH] --- yaml --- r: 340650 b: refs/heads/master c: 0cb2bbbea0857c5c76db4cae85343553a882c0de h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_private.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index bfdeb3dc4ef6..4ead5ff2506f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7c3f96a41f16865e6422bfb919312a716b16552 +refs/heads/master: 0cb2bbbea0857c5c76db4cae85343553a882c0de diff --git a/trunk/net/bridge/br_private.h b/trunk/net/bridge/br_private.h index d5efa57a2c20..22111ffd68df 100644 --- a/trunk/net/bridge/br_private.h +++ b/trunk/net/bridge/br_private.h @@ -570,10 +570,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