Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340650
b: refs/heads/master
c: 0cb2bbb
h: refs/heads/master
v: v3
  • Loading branch information
Lee Jones authored and David S. Miller committed Nov 4, 2012
1 parent 4f6721e commit 4ce428e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7c3f96a41f16865e6422bfb919312a716b16552
refs/heads/master: 0cb2bbbea0857c5c76db4cae85343553a882c0de
8 changes: 4 additions & 4 deletions trunk/net/bridge/br_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 4ce428e

Please sign in to comment.