Commit 7979472b authored by Romain Aviolat's avatar Romain Aviolat Committed by David S. Miller

DRIVERS: net: macsec: Fix multiple coding style issues

This patch fixes a couple of issues highlighted by checkpatch.pl:

    * Missing a blank line after declarations
    * Alignment should match open parenthesis
Signed-off-by: default avatarRomain Aviolat <r.aviolat@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 957b085c
...@@ -64,9 +64,9 @@ struct macsec_eth_header { ...@@ -64,9 +64,9 @@ struct macsec_eth_header {
#define MACSEC_NUM_AN 4 /* 2 bits for the association number */ #define MACSEC_NUM_AN 4 /* 2 bits for the association number */
#define for_each_rxsc(secy, sc) \ #define for_each_rxsc(secy, sc) \
for (sc = rcu_dereference_bh(secy->rx_sc); \ for (sc = rcu_dereference_bh(secy->rx_sc); \
sc; \ sc; \
sc = rcu_dereference_bh(sc->next)) sc = rcu_dereference_bh(sc->next))
#define for_each_rxsc_rtnl(secy, sc) \ #define for_each_rxsc_rtnl(secy, sc) \
for (sc = rtnl_dereference(secy->rx_sc); \ for (sc = rtnl_dereference(secy->rx_sc); \
...@@ -1142,6 +1142,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) ...@@ -1142,6 +1142,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb)
list_for_each_entry_rcu(macsec, &rxd->secys, secys) { list_for_each_entry_rcu(macsec, &rxd->secys, secys) {
struct macsec_rx_sc *sc = find_rx_sc(&macsec->secy, sci); struct macsec_rx_sc *sc = find_rx_sc(&macsec->secy, sci);
sc = sc ? macsec_rxsc_get(sc) : NULL; sc = sc ? macsec_rxsc_get(sc) : NULL;
if (sc) { if (sc) {
...@@ -1584,7 +1585,6 @@ static struct macsec_rx_sa *get_rxsa_from_nl(struct net *net, ...@@ -1584,7 +1585,6 @@ static struct macsec_rx_sa *get_rxsa_from_nl(struct net *net,
return rx_sa; return rx_sa;
} }
static const struct nla_policy macsec_genl_policy[NUM_MACSEC_ATTR] = { static const struct nla_policy macsec_genl_policy[NUM_MACSEC_ATTR] = {
[MACSEC_ATTR_IFINDEX] = { .type = NLA_U32 }, [MACSEC_ATTR_IFINDEX] = { .type = NLA_U32 },
[MACSEC_ATTR_RXSC_CONFIG] = { .type = NLA_NESTED }, [MACSEC_ATTR_RXSC_CONFIG] = { .type = NLA_NESTED },
...@@ -2156,7 +2156,7 @@ static int macsec_upd_rxsc(struct sk_buff *skb, struct genl_info *info) ...@@ -2156,7 +2156,7 @@ static int macsec_upd_rxsc(struct sk_buff *skb, struct genl_info *info)
} }
static int copy_tx_sa_stats(struct sk_buff *skb, static int copy_tx_sa_stats(struct sk_buff *skb,
struct macsec_tx_sa_stats __percpu *pstats) struct macsec_tx_sa_stats __percpu *pstats)
{ {
struct macsec_tx_sa_stats sum = {0, }; struct macsec_tx_sa_stats sum = {0, };
int cpu; int cpu;
...@@ -2176,7 +2176,7 @@ static int copy_tx_sa_stats(struct sk_buff *skb, ...@@ -2176,7 +2176,7 @@ static int copy_tx_sa_stats(struct sk_buff *skb,
} }
static int copy_rx_sa_stats(struct sk_buff *skb, static int copy_rx_sa_stats(struct sk_buff *skb,
struct macsec_rx_sa_stats __percpu *pstats) struct macsec_rx_sa_stats __percpu *pstats)
{ {
struct macsec_rx_sa_stats sum = {0, }; struct macsec_rx_sa_stats sum = {0, };
int cpu; int cpu;
...@@ -2202,7 +2202,7 @@ static int copy_rx_sa_stats(struct sk_buff *skb, ...@@ -2202,7 +2202,7 @@ static int copy_rx_sa_stats(struct sk_buff *skb,
} }
static int copy_rx_sc_stats(struct sk_buff *skb, static int copy_rx_sc_stats(struct sk_buff *skb,
struct pcpu_rx_sc_stats __percpu *pstats) struct pcpu_rx_sc_stats __percpu *pstats)
{ {
struct macsec_rx_sc_stats sum = {0, }; struct macsec_rx_sc_stats sum = {0, };
int cpu; int cpu;
...@@ -2266,7 +2266,7 @@ static int copy_rx_sc_stats(struct sk_buff *skb, ...@@ -2266,7 +2266,7 @@ static int copy_rx_sc_stats(struct sk_buff *skb,
} }
static int copy_tx_sc_stats(struct sk_buff *skb, static int copy_tx_sc_stats(struct sk_buff *skb,
struct pcpu_tx_sc_stats __percpu *pstats) struct pcpu_tx_sc_stats __percpu *pstats)
{ {
struct macsec_tx_sc_stats sum = {0, }; struct macsec_tx_sc_stats sum = {0, };
int cpu; int cpu;
...@@ -2306,7 +2306,7 @@ static int copy_tx_sc_stats(struct sk_buff *skb, ...@@ -2306,7 +2306,7 @@ static int copy_tx_sc_stats(struct sk_buff *skb,
} }
static int copy_secy_stats(struct sk_buff *skb, static int copy_secy_stats(struct sk_buff *skb,
struct pcpu_secy_stats __percpu *pstats) struct pcpu_secy_stats __percpu *pstats)
{ {
struct macsec_dev_stats sum = {0, }; struct macsec_dev_stats sum = {0, };
int cpu; int cpu;
...@@ -2962,13 +2962,11 @@ static int macsec_get_iflink(const struct net_device *dev) ...@@ -2962,13 +2962,11 @@ static int macsec_get_iflink(const struct net_device *dev)
return macsec_priv(dev)->real_dev->ifindex; return macsec_priv(dev)->real_dev->ifindex;
} }
static int macsec_get_nest_level(struct net_device *dev) static int macsec_get_nest_level(struct net_device *dev)
{ {
return macsec_priv(dev)->nest_level; return macsec_priv(dev)->nest_level;
} }
static const struct net_device_ops macsec_netdev_ops = { static const struct net_device_ops macsec_netdev_ops = {
.ndo_init = macsec_dev_init, .ndo_init = macsec_dev_init,
.ndo_uninit = macsec_dev_uninit, .ndo_uninit = macsec_dev_uninit,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment