diff options
-rw-r--r-- | net/bridge/br_netfilter.c | 2 | ||||
-rw-r--r-- | net/bridge/br_sysfs_if.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index 80cad2cf02a7..b008c59a92c4 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -1001,7 +1001,7 @@ static struct nf_hook_ops br_nf_ops[] __read_mostly = { | |||
1001 | #ifdef CONFIG_SYSCTL | 1001 | #ifdef CONFIG_SYSCTL |
1002 | static | 1002 | static |
1003 | int brnf_sysctl_call_tables(struct ctl_table *ctl, int write, | 1003 | int brnf_sysctl_call_tables(struct ctl_table *ctl, int write, |
1004 | void __user * buffer, size_t * lenp, loff_t * ppos) | 1004 | void __user *buffer, size_t *lenp, loff_t *ppos) |
1005 | { | 1005 | { |
1006 | int ret; | 1006 | int ret; |
1007 | 1007 | ||
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c index 1549b26ad4e5..dd595bd7fa82 100644 --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c | |||
@@ -209,21 +209,21 @@ static const struct brport_attribute *brport_attrs[] = { | |||
209 | #define to_brport_attr(_at) container_of(_at, struct brport_attribute, attr) | 209 | #define to_brport_attr(_at) container_of(_at, struct brport_attribute, attr) |
210 | #define to_brport(obj) container_of(obj, struct net_bridge_port, kobj) | 210 | #define to_brport(obj) container_of(obj, struct net_bridge_port, kobj) |
211 | 211 | ||
212 | static ssize_t brport_show(struct kobject * kobj, | 212 | static ssize_t brport_show(struct kobject *kobj, |
213 | struct attribute * attr, char * buf) | 213 | struct attribute *attr, char *buf) |
214 | { | 214 | { |
215 | struct brport_attribute * brport_attr = to_brport_attr(attr); | 215 | struct brport_attribute *brport_attr = to_brport_attr(attr); |
216 | struct net_bridge_port * p = to_brport(kobj); | 216 | struct net_bridge_port *p = to_brport(kobj); |
217 | 217 | ||
218 | return brport_attr->show(p, buf); | 218 | return brport_attr->show(p, buf); |
219 | } | 219 | } |
220 | 220 | ||
221 | static ssize_t brport_store(struct kobject * kobj, | 221 | static ssize_t brport_store(struct kobject *kobj, |
222 | struct attribute * attr, | 222 | struct attribute *attr, |
223 | const char * buf, size_t count) | 223 | const char *buf, size_t count) |
224 | { | 224 | { |
225 | struct brport_attribute * brport_attr = to_brport_attr(attr); | 225 | struct brport_attribute *brport_attr = to_brport_attr(attr); |
226 | struct net_bridge_port * p = to_brport(kobj); | 226 | struct net_bridge_port *p = to_brport(kobj); |
227 | ssize_t ret = -EINVAL; | 227 | ssize_t ret = -EINVAL; |
228 | char *endp; | 228 | char *endp; |
229 | unsigned long val; | 229 | unsigned long val; |