* [PATCH 0/5] bridge: cleanup and fix checkpatch errors
@ 2013-12-19 5:28 ` Tan Xiaojun
0 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: bridge, netdev
Clean up and fix some checkpatch errors in bridge driver.
Tan Xiaojun (5):
bridge: remove unnecessary condition judgment
bridge: remove unnecessary parentheses
bridge: add space before '(/{', after ',', etc.
bridge: change "foo* bar" to "foo *bar"
bridge: change the position of '{' to the pre line
net/bridge/br_fdb.c | 3 +--
net/bridge/br_forward.c | 4 ++--
net/bridge/br_ioctl.c | 2 +-
net/bridge/br_netfilter.c | 2 +-
net/bridge/br_netlink.c | 3 +--
net/bridge/br_private.h | 2 +-
net/bridge/br_stp_timer.c | 2 +-
net/bridge/br_sysfs_if.c | 20 ++++++++++----------
net/bridge/netfilter/ebt_log.c | 2 +-
net/bridge/netfilter/ebt_snat.c | 2 +-
net/bridge/netfilter/ebtable_broute.c | 6 ++----
net/bridge/netfilter/ebtable_filter.c | 9 +++------
net/bridge/netfilter/ebtable_nat.c | 9 +++------
net/bridge/netfilter/ebtables.c | 17 ++++++++---------
14 files changed, 36 insertions(+), 47 deletions(-)
--
1.8.0
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Bridge] [PATCH 0/5] bridge: cleanup and fix checkpatch errors
@ 2013-12-19 5:28 ` Tan Xiaojun
0 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: netdev, bridge
Clean up and fix some checkpatch errors in bridge driver.
Tan Xiaojun (5):
bridge: remove unnecessary condition judgment
bridge: remove unnecessary parentheses
bridge: add space before '(/{', after ',', etc.
bridge: change "foo* bar" to "foo *bar"
bridge: change the position of '{' to the pre line
net/bridge/br_fdb.c | 3 +--
net/bridge/br_forward.c | 4 ++--
net/bridge/br_ioctl.c | 2 +-
net/bridge/br_netfilter.c | 2 +-
net/bridge/br_netlink.c | 3 +--
net/bridge/br_private.h | 2 +-
net/bridge/br_stp_timer.c | 2 +-
net/bridge/br_sysfs_if.c | 20 ++++++++++----------
net/bridge/netfilter/ebt_log.c | 2 +-
net/bridge/netfilter/ebt_snat.c | 2 +-
net/bridge/netfilter/ebtable_broute.c | 6 ++----
net/bridge/netfilter/ebtable_filter.c | 9 +++------
net/bridge/netfilter/ebtable_nat.c | 9 +++------
net/bridge/netfilter/ebtables.c | 17 ++++++++---------
14 files changed, 36 insertions(+), 47 deletions(-)
--
1.8.0
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 1/5] bridge: remove unnecessary condition judgment
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
@ 2013-12-19 5:28 ` Tan Xiaojun
-1 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: bridge, netdev
Because err is always negative, remove unnecessary condition
judgment.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/br_fdb.c | 3 +--
net/bridge/br_netlink.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 33e8f23..c5f5a4a 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -570,8 +570,7 @@ static void fdb_notify(struct net_bridge *br,
rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);
return;
errout:
- if (err < 0)
- rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);
+ rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);
}
/* Dump information about entries, in response to GETNEIGH */
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index c2fd6bc..6526ac8 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -195,8 +195,7 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port)
rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);
return;
errout:
- if (err < 0)
- rtnl_set_sk_err(net, RTNLGRP_LINK, err);
+ rtnl_set_sk_err(net, RTNLGRP_LINK, err);
}
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Bridge] [PATCH 1/5] bridge: remove unnecessary condition judgment
@ 2013-12-19 5:28 ` Tan Xiaojun
0 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: netdev, bridge
Because err is always negative, remove unnecessary condition
judgment.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/br_fdb.c | 3 +--
net/bridge/br_netlink.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 33e8f23..c5f5a4a 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -570,8 +570,7 @@ static void fdb_notify(struct net_bridge *br,
rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);
return;
errout:
- if (err < 0)
- rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);
+ rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);
}
/* Dump information about entries, in response to GETNEIGH */
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index c2fd6bc..6526ac8 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -195,8 +195,7 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port)
rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);
return;
errout:
- if (err < 0)
- rtnl_set_sk_err(net, RTNLGRP_LINK, err);
+ rtnl_set_sk_err(net, RTNLGRP_LINK, err);
}
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 2/5] bridge: remove unnecessary parentheses
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
@ 2013-12-19 5:28 ` Tan Xiaojun
-1 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: bridge, netdev
Return is not a function, parentheses are not required.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/br_forward.c | 4 ++--
net/bridge/netfilter/ebtables.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 96866aa..d3409e6 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -30,9 +30,9 @@ static int deliver_clone(const struct net_bridge_port *prev,
static inline int should_deliver(const struct net_bridge_port *p,
const struct sk_buff *skb)
{
- return (((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) &&
+ return ((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) &&
br_allowed_egress(p->br, nbp_get_vlan_info(p), skb) &&
- p->state == BR_STATE_FORWARDING);
+ p->state == BR_STATE_FORWARDING;
}
static inline unsigned int packet_length(const struct sk_buff *skb)
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index ac78024..09d16d7 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -118,7 +118,7 @@ ebt_dev_check(const char *entry, const struct net_device *device)
/* 1 is the wildcard token */
while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i])
i++;
- return (devname[i] != entry[i] && entry[i] != 1);
+ return devname[i] != entry[i] && entry[i] != 1;
}
#define FWINV2(bool,invflg) ((bool) ^ !!(e->invflags & invflg))
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Bridge] [PATCH 2/5] bridge: remove unnecessary parentheses
@ 2013-12-19 5:28 ` Tan Xiaojun
0 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: netdev, bridge
Return is not a function, parentheses are not required.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/br_forward.c | 4 ++--
net/bridge/netfilter/ebtables.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 96866aa..d3409e6 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -30,9 +30,9 @@ static int deliver_clone(const struct net_bridge_port *prev,
static inline int should_deliver(const struct net_bridge_port *p,
const struct sk_buff *skb)
{
- return (((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) &&
+ return ((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) &&
br_allowed_egress(p->br, nbp_get_vlan_info(p), skb) &&
- p->state == BR_STATE_FORWARDING);
+ p->state == BR_STATE_FORWARDING;
}
static inline unsigned int packet_length(const struct sk_buff *skb)
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index ac78024..09d16d7 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -118,7 +118,7 @@ ebt_dev_check(const char *entry, const struct net_device *device)
/* 1 is the wildcard token */
while (entry[i] != '\0' && entry[i] != 1 && entry[i] == devname[i])
i++;
- return (devname[i] != entry[i] && entry[i] != 1);
+ return devname[i] != entry[i] && entry[i] != 1;
}
#define FWINV2(bool,invflg) ((bool) ^ !!(e->invflags & invflg))
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 3/5] bridge: add space before '(/{', after ',', etc.
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
@ 2013-12-19 5:28 ` Tan Xiaojun
-1 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: bridge, netdev
Spaces required before the open parenthesis '(', before the open
brace '{', after that ',' and around that '?/:'.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/br_ioctl.c | 2 +-
net/bridge/br_private.h | 2 +-
net/bridge/br_stp_timer.c | 2 +-
net/bridge/br_sysfs_if.c | 2 +-
net/bridge/netfilter/ebt_log.c | 2 +-
net/bridge/netfilter/ebt_snat.c | 2 +-
net/bridge/netfilter/ebtables.c | 12 ++++++------
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index cd8c3a4..a9a4a1b 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -381,7 +381,7 @@ int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
struct net_bridge *br = netdev_priv(dev);
- switch(cmd) {
+ switch (cmd) {
case SIOCDEVPRIVATE:
return old_dev_ioctl(dev, rq, cmd);
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 045d56e..2e77d92 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -721,7 +721,7 @@ void br_netfilter_fini(void);
void br_netfilter_rtable_init(struct net_bridge *);
#else
#define br_netfilter_init() (0)
-#define br_netfilter_fini() do { } while(0)
+#define br_netfilter_fini() do { } while (0)
#define br_netfilter_rtable_init(x)
#endif
diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 950663d..558c46d 100644
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -110,7 +110,7 @@ static void br_tcn_timer_expired(unsigned long arg)
if (!br_is_root_bridge(br) && (br->dev->flags & IFF_UP)) {
br_transmit_tcn(br);
- mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time);
+ mod_timer(&br->tcn_timer, jiffies + br->bridge_hello_time);
}
spin_unlock(&br->lock);
}
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index 2a2cdb7..1549b26 100644
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -26,7 +26,7 @@ struct brport_attribute {
int (*store)(struct net_bridge_port *, unsigned long);
};
-#define BRPORT_ATTR(_name,_mode,_show,_store) \
+#define BRPORT_ATTR(_name, _mode, _show, _store) \
const struct brport_attribute brport_attr_##_name = { \
.attr = {.name = __stringify(_name), \
.mode = _mode }, \
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
index 19c37a4..5322a36 100644
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -96,7 +96,7 @@ ebt_log_packet(struct net *net, u_int8_t pf, unsigned int hooknum,
bitmask = NF_LOG_MASK;
if ((bitmask & EBT_LOG_IP) && eth_hdr(skb)->h_proto ==
- htons(ETH_P_IP)){
+ htons(ETH_P_IP)) {
const struct iphdr *ih;
struct iphdr _iph;
diff --git a/net/bridge/netfilter/ebt_snat.c b/net/bridge/netfilter/ebt_snat.c
index f8f0bd1..0f6b118 100644
--- a/net/bridge/netfilter/ebt_snat.c
+++ b/net/bridge/netfilter/ebt_snat.c
@@ -35,7 +35,7 @@ ebt_snat_tg(struct sk_buff *skb, const struct xt_action_param *par)
return EBT_DROP;
if (ap->ar_hln != ETH_ALEN)
goto out;
- if (skb_store_bits(skb, sizeof(_ah), info->mac,ETH_ALEN))
+ if (skb_store_bits(skb, sizeof(_ah), info->mac, ETH_ALEN))
return EBT_DROP;
}
out:
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 09d16d7..185aa9c 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -121,7 +121,7 @@ ebt_dev_check(const char *entry, const struct net_device *device)
return devname[i] != entry[i] && entry[i] != 1;
}
-#define FWINV2(bool,invflg) ((bool) ^ !!(e->invflags & invflg))
+#define FWINV2(bool, invflg) ((bool) ^ !!(e->invflags & invflg))
/* process standard matches */
static inline int
ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb,
@@ -1441,7 +1441,7 @@ static int copy_everything_to_user(struct ebt_table *t, void __user *user,
return -EFAULT;
if (*len != sizeof(struct ebt_replace) + entries_size +
- (tmp.num_counters? nentries * sizeof(struct ebt_counter): 0))
+ (tmp.num_counters ? nentries * sizeof(struct ebt_counter) : 0))
return -EINVAL;
if (tmp.nentries != nentries) {
@@ -1477,7 +1477,7 @@ static int do_ebt_set_ctl(struct sock *sk,
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
return -EPERM;
- switch(cmd) {
+ switch (cmd) {
case EBT_SO_SET_ENTRIES:
ret = do_replace(net, user, len);
break;
@@ -1507,10 +1507,10 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
if (!t)
return ret;
- switch(cmd) {
+ switch (cmd) {
case EBT_SO_GET_INFO:
case EBT_SO_GET_INIT_INFO:
- if (*len != sizeof(struct ebt_replace)){
+ if (*len != sizeof(struct ebt_replace)) {
ret = -EINVAL;
mutex_unlock(&ebt_mutex);
break;
@@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
tmp.valid_hooks = t->table->valid_hooks;
}
mutex_unlock(&ebt_mutex);
- if (copy_to_user(user, &tmp, *len) != 0){
+ if (copy_to_user(user, &tmp, *len) != 0) {
BUGPRINT("c2u Didn't work\n");
ret = -EFAULT;
break;
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Bridge] [PATCH 3/5] bridge: add space before '(/{', after ', ', etc.
@ 2013-12-19 5:28 ` Tan Xiaojun
0 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: netdev, bridge
Spaces required before the open parenthesis '(', before the open
brace '{', after that ',' and around that '?/:'.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/br_ioctl.c | 2 +-
net/bridge/br_private.h | 2 +-
net/bridge/br_stp_timer.c | 2 +-
net/bridge/br_sysfs_if.c | 2 +-
net/bridge/netfilter/ebt_log.c | 2 +-
net/bridge/netfilter/ebt_snat.c | 2 +-
net/bridge/netfilter/ebtables.c | 12 ++++++------
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index cd8c3a4..a9a4a1b 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -381,7 +381,7 @@ int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
struct net_bridge *br = netdev_priv(dev);
- switch(cmd) {
+ switch (cmd) {
case SIOCDEVPRIVATE:
return old_dev_ioctl(dev, rq, cmd);
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 045d56e..2e77d92 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -721,7 +721,7 @@ void br_netfilter_fini(void);
void br_netfilter_rtable_init(struct net_bridge *);
#else
#define br_netfilter_init() (0)
-#define br_netfilter_fini() do { } while(0)
+#define br_netfilter_fini() do { } while (0)
#define br_netfilter_rtable_init(x)
#endif
diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 950663d..558c46d 100644
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -110,7 +110,7 @@ static void br_tcn_timer_expired(unsigned long arg)
if (!br_is_root_bridge(br) && (br->dev->flags & IFF_UP)) {
br_transmit_tcn(br);
- mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time);
+ mod_timer(&br->tcn_timer, jiffies + br->bridge_hello_time);
}
spin_unlock(&br->lock);
}
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index 2a2cdb7..1549b26 100644
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -26,7 +26,7 @@ struct brport_attribute {
int (*store)(struct net_bridge_port *, unsigned long);
};
-#define BRPORT_ATTR(_name,_mode,_show,_store) \
+#define BRPORT_ATTR(_name, _mode, _show, _store) \
const struct brport_attribute brport_attr_##_name = { \
.attr = {.name = __stringify(_name), \
.mode = _mode }, \
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
index 19c37a4..5322a36 100644
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -96,7 +96,7 @@ ebt_log_packet(struct net *net, u_int8_t pf, unsigned int hooknum,
bitmask = NF_LOG_MASK;
if ((bitmask & EBT_LOG_IP) && eth_hdr(skb)->h_proto ==
- htons(ETH_P_IP)){
+ htons(ETH_P_IP)) {
const struct iphdr *ih;
struct iphdr _iph;
diff --git a/net/bridge/netfilter/ebt_snat.c b/net/bridge/netfilter/ebt_snat.c
index f8f0bd1..0f6b118 100644
--- a/net/bridge/netfilter/ebt_snat.c
+++ b/net/bridge/netfilter/ebt_snat.c
@@ -35,7 +35,7 @@ ebt_snat_tg(struct sk_buff *skb, const struct xt_action_param *par)
return EBT_DROP;
if (ap->ar_hln != ETH_ALEN)
goto out;
- if (skb_store_bits(skb, sizeof(_ah), info->mac,ETH_ALEN))
+ if (skb_store_bits(skb, sizeof(_ah), info->mac, ETH_ALEN))
return EBT_DROP;
}
out:
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 09d16d7..185aa9c 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -121,7 +121,7 @@ ebt_dev_check(const char *entry, const struct net_device *device)
return devname[i] != entry[i] && entry[i] != 1;
}
-#define FWINV2(bool,invflg) ((bool) ^ !!(e->invflags & invflg))
+#define FWINV2(bool, invflg) ((bool) ^ !!(e->invflags & invflg))
/* process standard matches */
static inline int
ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb,
@@ -1441,7 +1441,7 @@ static int copy_everything_to_user(struct ebt_table *t, void __user *user,
return -EFAULT;
if (*len != sizeof(struct ebt_replace) + entries_size +
- (tmp.num_counters? nentries * sizeof(struct ebt_counter): 0))
+ (tmp.num_counters ? nentries * sizeof(struct ebt_counter) : 0))
return -EINVAL;
if (tmp.nentries != nentries) {
@@ -1477,7 +1477,7 @@ static int do_ebt_set_ctl(struct sock *sk,
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
return -EPERM;
- switch(cmd) {
+ switch (cmd) {
case EBT_SO_SET_ENTRIES:
ret = do_replace(net, user, len);
break;
@@ -1507,10 +1507,10 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
if (!t)
return ret;
- switch(cmd) {
+ switch (cmd) {
case EBT_SO_GET_INFO:
case EBT_SO_GET_INIT_INFO:
- if (*len != sizeof(struct ebt_replace)){
+ if (*len != sizeof(struct ebt_replace)) {
ret = -EINVAL;
mutex_unlock(&ebt_mutex);
break;
@@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
tmp.valid_hooks = t->table->valid_hooks;
}
mutex_unlock(&ebt_mutex);
- if (copy_to_user(user, &tmp, *len) != 0){
+ if (copy_to_user(user, &tmp, *len) != 0) {
BUGPRINT("c2u Didn't work\n");
ret = -EFAULT;
break;
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 4/5] bridge: change "foo* bar" to "foo *bar"
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
@ 2013-12-19 5:28 ` Tan Xiaojun
-1 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: bridge, netdev
"foo * bar" should be "foo *bar".
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/br_netfilter.c | 2 +-
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 80cad2c..b008c59 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 = {
#ifdef CONFIG_SYSCTL
static
int brnf_sysctl_call_tables(struct ctl_table *ctl, int write,
- void __user * buffer, size_t * lenp, loff_t * ppos)
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int ret;
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index 1549b26..dd595bd 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[] = {
#define to_brport_attr(_at) container_of(_at, struct brport_attribute, attr)
#define to_brport(obj) container_of(obj, struct net_bridge_port, kobj)
-static ssize_t brport_show(struct kobject * kobj,
- struct attribute * attr, char * buf)
+static ssize_t brport_show(struct kobject *kobj,
+ struct attribute *attr, char *buf)
{
- struct brport_attribute * brport_attr = to_brport_attr(attr);
- struct net_bridge_port * p = to_brport(kobj);
+ struct brport_attribute *brport_attr = to_brport_attr(attr);
+ struct net_bridge_port *p = to_brport(kobj);
return brport_attr->show(p, buf);
}
-static ssize_t brport_store(struct kobject * kobj,
- struct attribute * attr,
- const char * buf, size_t count)
+static ssize_t brport_store(struct kobject *kobj,
+ struct attribute *attr,
+ const char *buf, size_t count)
{
- struct brport_attribute * brport_attr = to_brport_attr(attr);
- struct net_bridge_port * p = to_brport(kobj);
+ struct brport_attribute *brport_attr = to_brport_attr(attr);
+ struct net_bridge_port *p = to_brport(kobj);
ssize_t ret = -EINVAL;
char *endp;
unsigned long val;
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Bridge] [PATCH 4/5] bridge: change "foo* bar" to "foo *bar"
@ 2013-12-19 5:28 ` Tan Xiaojun
0 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: netdev, bridge
"foo * bar" should be "foo *bar".
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/br_netfilter.c | 2 +-
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 80cad2c..b008c59 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 = {
#ifdef CONFIG_SYSCTL
static
int brnf_sysctl_call_tables(struct ctl_table *ctl, int write,
- void __user * buffer, size_t * lenp, loff_t * ppos)
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int ret;
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index 1549b26..dd595bd 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[] = {
#define to_brport_attr(_at) container_of(_at, struct brport_attribute, attr)
#define to_brport(obj) container_of(obj, struct net_bridge_port, kobj)
-static ssize_t brport_show(struct kobject * kobj,
- struct attribute * attr, char * buf)
+static ssize_t brport_show(struct kobject *kobj,
+ struct attribute *attr, char *buf)
{
- struct brport_attribute * brport_attr = to_brport_attr(attr);
- struct net_bridge_port * p = to_brport(kobj);
+ struct brport_attribute *brport_attr = to_brport_attr(attr);
+ struct net_bridge_port *p = to_brport(kobj);
return brport_attr->show(p, buf);
}
-static ssize_t brport_store(struct kobject * kobj,
- struct attribute * attr,
- const char * buf, size_t count)
+static ssize_t brport_store(struct kobject *kobj,
+ struct attribute *attr,
+ const char *buf, size_t count)
{
- struct brport_attribute * brport_attr = to_brport_attr(attr);
- struct net_bridge_port * p = to_brport(kobj);
+ struct brport_attribute *brport_attr = to_brport_attr(attr);
+ struct net_bridge_port *p = to_brport(kobj);
ssize_t ret = -EINVAL;
char *endp;
unsigned long val;
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 5/5] bridge: change the position of '{' to the pre line
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
@ 2013-12-19 5:28 ` Tan Xiaojun
-1 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: bridge, netdev
That open brace { should be on the previous line.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/netfilter/ebtable_broute.c | 6 ++----
net/bridge/netfilter/ebtable_filter.c | 9 +++------
net/bridge/netfilter/ebtable_nat.c | 9 +++------
net/bridge/netfilter/ebtables.c | 3 +--
4 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c
index dbd1c78..d2cdf5d 100644
--- a/net/bridge/netfilter/ebtable_broute.c
+++ b/net/bridge/netfilter/ebtable_broute.c
@@ -23,8 +23,7 @@ static struct ebt_entries initial_chain = {
.policy = EBT_ACCEPT,
};
-static struct ebt_replace_kernel initial_table =
-{
+static struct ebt_replace_kernel initial_table = {
.name = "broute",
.valid_hooks = 1 << NF_BR_BROUTING,
.entries_size = sizeof(struct ebt_entries),
@@ -41,8 +40,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
return 0;
}
-static const struct ebt_table broute_table =
-{
+static const struct ebt_table broute_table = {
.name = "broute",
.table = &initial_table,
.valid_hooks = 1 << NF_BR_BROUTING,
diff --git a/net/bridge/netfilter/ebtable_filter.c b/net/bridge/netfilter/ebtable_filter.c
index bb2da7b..ce205aa 100644
--- a/net/bridge/netfilter/ebtable_filter.c
+++ b/net/bridge/netfilter/ebtable_filter.c
@@ -14,8 +14,7 @@
#define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \
(1 << NF_BR_LOCAL_OUT))
-static struct ebt_entries initial_chains[] =
-{
+static struct ebt_entries initial_chains[] = {
{
.name = "INPUT",
.policy = EBT_ACCEPT,
@@ -30,8 +29,7 @@ static struct ebt_entries initial_chains[] =
},
};
-static struct ebt_replace_kernel initial_table =
-{
+static struct ebt_replace_kernel initial_table = {
.name = "filter",
.valid_hooks = FILTER_VALID_HOOKS,
.entries_size = 3 * sizeof(struct ebt_entries),
@@ -50,8 +48,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
return 0;
}
-static const struct ebt_table frame_filter =
-{
+static const struct ebt_table frame_filter = {
.name = "filter",
.table = &initial_table,
.valid_hooks = FILTER_VALID_HOOKS,
diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c
index bd238f1..a0ac298 100644
--- a/net/bridge/netfilter/ebtable_nat.c
+++ b/net/bridge/netfilter/ebtable_nat.c
@@ -14,8 +14,7 @@
#define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \
(1 << NF_BR_POST_ROUTING))
-static struct ebt_entries initial_chains[] =
-{
+static struct ebt_entries initial_chains[] = {
{
.name = "PREROUTING",
.policy = EBT_ACCEPT,
@@ -30,8 +29,7 @@ static struct ebt_entries initial_chains[] =
}
};
-static struct ebt_replace_kernel initial_table =
-{
+static struct ebt_replace_kernel initial_table = {
.name = "nat",
.valid_hooks = NAT_VALID_HOOKS,
.entries_size = 3 * sizeof(struct ebt_entries),
@@ -50,8 +48,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
return 0;
}
-static struct ebt_table frame_nat =
-{
+static struct ebt_table frame_nat = {
.name = "nat",
.table = &initial_table,
.valid_hooks = NAT_VALID_HOOKS,
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 185aa9c..0e474b1 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -2375,8 +2375,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
}
#endif
-static struct nf_sockopt_ops ebt_sockopts =
-{
+static struct nf_sockopt_ops ebt_sockopts = {
.pf = PF_INET,
.set_optmin = EBT_BASE_CTL,
.set_optmax = EBT_SO_SET_MAX + 1,
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Bridge] [PATCH 5/5] bridge: change the position of '{' to the pre line
@ 2013-12-19 5:28 ` Tan Xiaojun
0 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 5:28 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: netdev, bridge
That open brace { should be on the previous line.
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
---
net/bridge/netfilter/ebtable_broute.c | 6 ++----
net/bridge/netfilter/ebtable_filter.c | 9 +++------
net/bridge/netfilter/ebtable_nat.c | 9 +++------
net/bridge/netfilter/ebtables.c | 3 +--
4 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c
index dbd1c78..d2cdf5d 100644
--- a/net/bridge/netfilter/ebtable_broute.c
+++ b/net/bridge/netfilter/ebtable_broute.c
@@ -23,8 +23,7 @@ static struct ebt_entries initial_chain = {
.policy = EBT_ACCEPT,
};
-static struct ebt_replace_kernel initial_table =
-{
+static struct ebt_replace_kernel initial_table = {
.name = "broute",
.valid_hooks = 1 << NF_BR_BROUTING,
.entries_size = sizeof(struct ebt_entries),
@@ -41,8 +40,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
return 0;
}
-static const struct ebt_table broute_table =
-{
+static const struct ebt_table broute_table = {
.name = "broute",
.table = &initial_table,
.valid_hooks = 1 << NF_BR_BROUTING,
diff --git a/net/bridge/netfilter/ebtable_filter.c b/net/bridge/netfilter/ebtable_filter.c
index bb2da7b..ce205aa 100644
--- a/net/bridge/netfilter/ebtable_filter.c
+++ b/net/bridge/netfilter/ebtable_filter.c
@@ -14,8 +14,7 @@
#define FILTER_VALID_HOOKS ((1 << NF_BR_LOCAL_IN) | (1 << NF_BR_FORWARD) | \
(1 << NF_BR_LOCAL_OUT))
-static struct ebt_entries initial_chains[] =
-{
+static struct ebt_entries initial_chains[] = {
{
.name = "INPUT",
.policy = EBT_ACCEPT,
@@ -30,8 +29,7 @@ static struct ebt_entries initial_chains[] =
},
};
-static struct ebt_replace_kernel initial_table =
-{
+static struct ebt_replace_kernel initial_table = {
.name = "filter",
.valid_hooks = FILTER_VALID_HOOKS,
.entries_size = 3 * sizeof(struct ebt_entries),
@@ -50,8 +48,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
return 0;
}
-static const struct ebt_table frame_filter =
-{
+static const struct ebt_table frame_filter = {
.name = "filter",
.table = &initial_table,
.valid_hooks = FILTER_VALID_HOOKS,
diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c
index bd238f1..a0ac298 100644
--- a/net/bridge/netfilter/ebtable_nat.c
+++ b/net/bridge/netfilter/ebtable_nat.c
@@ -14,8 +14,7 @@
#define NAT_VALID_HOOKS ((1 << NF_BR_PRE_ROUTING) | (1 << NF_BR_LOCAL_OUT) | \
(1 << NF_BR_POST_ROUTING))
-static struct ebt_entries initial_chains[] =
-{
+static struct ebt_entries initial_chains[] = {
{
.name = "PREROUTING",
.policy = EBT_ACCEPT,
@@ -30,8 +29,7 @@ static struct ebt_entries initial_chains[] =
}
};
-static struct ebt_replace_kernel initial_table =
-{
+static struct ebt_replace_kernel initial_table = {
.name = "nat",
.valid_hooks = NAT_VALID_HOOKS,
.entries_size = 3 * sizeof(struct ebt_entries),
@@ -50,8 +48,7 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
return 0;
}
-static struct ebt_table frame_nat =
-{
+static struct ebt_table frame_nat = {
.name = "nat",
.table = &initial_table,
.valid_hooks = NAT_VALID_HOOKS,
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 185aa9c..0e474b1 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -2375,8 +2375,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
}
#endif
-static struct nf_sockopt_ops ebt_sockopts =
-{
+static struct nf_sockopt_ops ebt_sockopts = {
.pf = PF_INET,
.set_optmin = EBT_BASE_CTL,
.set_optmax = EBT_SO_SET_MAX + 1,
--
1.8.0
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 0/5] bridge: cleanup and fix checkpatch errors
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
@ 2013-12-19 6:59 ` Tan Xiaojun
-1 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 6:59 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: bridge, netdev
Sorry, I forgot to mark this series "net-next". Should I need to send them again?
On 2013/12/19 13:28, Tan Xiaojun wrote:
> Clean up and fix some checkpatch errors in bridge driver.
>
> Tan Xiaojun (5):
> bridge: remove unnecessary condition judgment
> bridge: remove unnecessary parentheses
> bridge: add space before '(/{', after ',', etc.
> bridge: change "foo* bar" to "foo *bar"
> bridge: change the position of '{' to the pre line
>
> net/bridge/br_fdb.c | 3 +--
> net/bridge/br_forward.c | 4 ++--
> net/bridge/br_ioctl.c | 2 +-
> net/bridge/br_netfilter.c | 2 +-
> net/bridge/br_netlink.c | 3 +--
> net/bridge/br_private.h | 2 +-
> net/bridge/br_stp_timer.c | 2 +-
> net/bridge/br_sysfs_if.c | 20 ++++++++++----------
> net/bridge/netfilter/ebt_log.c | 2 +-
> net/bridge/netfilter/ebt_snat.c | 2 +-
> net/bridge/netfilter/ebtable_broute.c | 6 ++----
> net/bridge/netfilter/ebtable_filter.c | 9 +++------
> net/bridge/netfilter/ebtable_nat.c | 9 +++------
> net/bridge/netfilter/ebtables.c | 17 ++++++++---------
> 14 files changed, 36 insertions(+), 47 deletions(-)
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [Bridge] [PATCH 0/5] bridge: cleanup and fix checkpatch errors
@ 2013-12-19 6:59 ` Tan Xiaojun
0 siblings, 0 replies; 18+ messages in thread
From: Tan Xiaojun @ 2013-12-19 6:59 UTC (permalink / raw)
To: stephen, davem, bart.de.schuymer; +Cc: netdev, bridge
Sorry, I forgot to mark this series "net-next". Should I need to send them again?
On 2013/12/19 13:28, Tan Xiaojun wrote:
> Clean up and fix some checkpatch errors in bridge driver.
>
> Tan Xiaojun (5):
> bridge: remove unnecessary condition judgment
> bridge: remove unnecessary parentheses
> bridge: add space before '(/{', after ',', etc.
> bridge: change "foo* bar" to "foo *bar"
> bridge: change the position of '{' to the pre line
>
> net/bridge/br_fdb.c | 3 +--
> net/bridge/br_forward.c | 4 ++--
> net/bridge/br_ioctl.c | 2 +-
> net/bridge/br_netfilter.c | 2 +-
> net/bridge/br_netlink.c | 3 +--
> net/bridge/br_private.h | 2 +-
> net/bridge/br_stp_timer.c | 2 +-
> net/bridge/br_sysfs_if.c | 20 ++++++++++----------
> net/bridge/netfilter/ebt_log.c | 2 +-
> net/bridge/netfilter/ebt_snat.c | 2 +-
> net/bridge/netfilter/ebtable_broute.c | 6 ++----
> net/bridge/netfilter/ebtable_filter.c | 9 +++------
> net/bridge/netfilter/ebtable_nat.c | 9 +++------
> net/bridge/netfilter/ebtables.c | 17 ++++++++---------
> 14 files changed, 36 insertions(+), 47 deletions(-)
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/5] bridge: cleanup and fix checkpatch errors
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
@ 2013-12-19 18:41 ` Stephen Hemminger
-1 siblings, 0 replies; 18+ messages in thread
From: Stephen Hemminger @ 2013-12-19 18:41 UTC (permalink / raw)
To: Tan Xiaojun; +Cc: bridge, bart.de.schuymer, davem, netdev
On Thu, 19 Dec 2013 13:28:09 +0800
Tan Xiaojun <tanxiaojun@huawei.com> wrote:
> Clean up and fix some checkpatch errors in bridge driver.
>
> Tan Xiaojun (5):
> bridge: remove unnecessary condition judgment
> bridge: remove unnecessary parentheses
> bridge: add space before '(/{', after ',', etc.
> bridge: change "foo* bar" to "foo *bar"
> bridge: change the position of '{' to the pre line
>
> net/bridge/br_fdb.c | 3 +--
> net/bridge/br_forward.c | 4 ++--
> net/bridge/br_ioctl.c | 2 +-
> net/bridge/br_netfilter.c | 2 +-
> net/bridge/br_netlink.c | 3 +--
> net/bridge/br_private.h | 2 +-
> net/bridge/br_stp_timer.c | 2 +-
> net/bridge/br_sysfs_if.c | 20 ++++++++++----------
> net/bridge/netfilter/ebt_log.c | 2 +-
> net/bridge/netfilter/ebt_snat.c | 2 +-
> net/bridge/netfilter/ebtable_broute.c | 6 ++----
> net/bridge/netfilter/ebtable_filter.c | 9 +++------
> net/bridge/netfilter/ebtable_nat.c | 9 +++------
> net/bridge/netfilter/ebtables.c | 17 ++++++++---------
> 14 files changed, 36 insertions(+), 47 deletions(-)
>
Thanks, these should go to net-next.
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [Bridge] [PATCH 0/5] bridge: cleanup and fix checkpatch errors
@ 2013-12-19 18:41 ` Stephen Hemminger
0 siblings, 0 replies; 18+ messages in thread
From: Stephen Hemminger @ 2013-12-19 18:41 UTC (permalink / raw)
To: Tan Xiaojun; +Cc: bridge, bart.de.schuymer, davem, netdev
On Thu, 19 Dec 2013 13:28:09 +0800
Tan Xiaojun <tanxiaojun@huawei.com> wrote:
> Clean up and fix some checkpatch errors in bridge driver.
>
> Tan Xiaojun (5):
> bridge: remove unnecessary condition judgment
> bridge: remove unnecessary parentheses
> bridge: add space before '(/{', after ',', etc.
> bridge: change "foo* bar" to "foo *bar"
> bridge: change the position of '{' to the pre line
>
> net/bridge/br_fdb.c | 3 +--
> net/bridge/br_forward.c | 4 ++--
> net/bridge/br_ioctl.c | 2 +-
> net/bridge/br_netfilter.c | 2 +-
> net/bridge/br_netlink.c | 3 +--
> net/bridge/br_private.h | 2 +-
> net/bridge/br_stp_timer.c | 2 +-
> net/bridge/br_sysfs_if.c | 20 ++++++++++----------
> net/bridge/netfilter/ebt_log.c | 2 +-
> net/bridge/netfilter/ebt_snat.c | 2 +-
> net/bridge/netfilter/ebtable_broute.c | 6 ++----
> net/bridge/netfilter/ebtable_filter.c | 9 +++------
> net/bridge/netfilter/ebtable_nat.c | 9 +++------
> net/bridge/netfilter/ebtables.c | 17 ++++++++---------
> 14 files changed, 36 insertions(+), 47 deletions(-)
>
Thanks, these should go to net-next.
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/5] bridge: cleanup and fix checkpatch errors
2013-12-19 18:41 ` [Bridge] " Stephen Hemminger
@ 2013-12-20 0:28 ` David Miller
-1 siblings, 0 replies; 18+ messages in thread
From: David Miller @ 2013-12-20 0:28 UTC (permalink / raw)
To: stephen; +Cc: bridge, bart.de.schuymer, tanxiaojun, netdev
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 19 Dec 2013 10:41:12 -0800
> On Thu, 19 Dec 2013 13:28:09 +0800
> Tan Xiaojun <tanxiaojun@huawei.com> wrote:
>
>> Clean up and fix some checkpatch errors in bridge driver.
>>
>> Tan Xiaojun (5):
>> bridge: remove unnecessary condition judgment
>> bridge: remove unnecessary parentheses
>> bridge: add space before '(/{', after ',', etc.
>> bridge: change "foo* bar" to "foo *bar"
>> bridge: change the position of '{' to the pre line
...
>
> Thanks, these should go to net-next.
>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Series applied, thanks.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [Bridge] [PATCH 0/5] bridge: cleanup and fix checkpatch errors
@ 2013-12-20 0:28 ` David Miller
0 siblings, 0 replies; 18+ messages in thread
From: David Miller @ 2013-12-20 0:28 UTC (permalink / raw)
To: stephen; +Cc: bridge, bart.de.schuymer, tanxiaojun, netdev
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 19 Dec 2013 10:41:12 -0800
> On Thu, 19 Dec 2013 13:28:09 +0800
> Tan Xiaojun <tanxiaojun@huawei.com> wrote:
>
>> Clean up and fix some checkpatch errors in bridge driver.
>>
>> Tan Xiaojun (5):
>> bridge: remove unnecessary condition judgment
>> bridge: remove unnecessary parentheses
>> bridge: add space before '(/{', after ',', etc.
>> bridge: change "foo* bar" to "foo *bar"
>> bridge: change the position of '{' to the pre line
...
>
> Thanks, these should go to net-next.
>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Series applied, thanks.
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2013-12-20 0:28 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-19 5:28 [PATCH 0/5] bridge: cleanup and fix checkpatch errors Tan Xiaojun
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
2013-12-19 5:28 ` [PATCH 1/5] bridge: remove unnecessary condition judgment Tan Xiaojun
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
2013-12-19 5:28 ` [PATCH 2/5] bridge: remove unnecessary parentheses Tan Xiaojun
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
2013-12-19 5:28 ` [PATCH 3/5] bridge: add space before '(/{', after ',', etc Tan Xiaojun
2013-12-19 5:28 ` [Bridge] [PATCH 3/5] bridge: add space before '(/{', after ', ', etc Tan Xiaojun
2013-12-19 5:28 ` [PATCH 4/5] bridge: change "foo* bar" to "foo *bar" Tan Xiaojun
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
2013-12-19 5:28 ` [PATCH 5/5] bridge: change the position of '{' to the pre line Tan Xiaojun
2013-12-19 5:28 ` [Bridge] " Tan Xiaojun
2013-12-19 6:59 ` [PATCH 0/5] bridge: cleanup and fix checkpatch errors Tan Xiaojun
2013-12-19 6:59 ` [Bridge] " Tan Xiaojun
2013-12-19 18:41 ` Stephen Hemminger
2013-12-19 18:41 ` [Bridge] " Stephen Hemminger
2013-12-20 0:28 ` David Miller
2013-12-20 0:28 ` [Bridge] " David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.