diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-12-19 19:27:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-19 19:27:34 -0500 |
| commit | 852ad5e631967ae2203cb08c5b6b42c26011ed63 (patch) | |
| tree | 09ff43c85794f466b2c5868a611613088fb68a23 /net/bridge/netfilter/ebt_log.c | |
| parent | bnx2x: cleanup skb_set_hash (diff) | |
| parent | bridge: change the position of '{' to the pre line (diff) | |
| download | linux-dev-852ad5e631967ae2203cb08c5b6b42c26011ed63.tar.xz linux-dev-852ad5e631967ae2203cb08c5b6b42c26011ed63.zip | |
Merge branch 'bridge_cleanups'
Tan Xiaojun says:
====================
bridge: cleanup and fix checkpatch errors
Clean up and fix some checkpatch errors in bridge driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Diffstat (limited to '')
| -rw-r--r-- | net/bridge/netfilter/ebt_log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c index 19c37a4929bc..5322a36867a3 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; |