Skip to content

Commit

Permalink
DRIVERS: net: macsec: Fix multiple coding style issues
Browse files Browse the repository at this point in the history 
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: Romain Aviolat <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@xens @davem330
xens authored and davem330 committed Sep 22, 2018
1 parent 957b085 commit 7979472
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions drivers/net/macsec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ struct macsec_eth_header {

#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); \
sc; \
sc; \
sc = rcu_dereference_bh(sc->next))
#define for_each_rxsc_rtnl(secy, sc) \
for (sc = rtnl_dereference(secy->rx_sc); \
Expand Down Expand Up @@ -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) {
struct macsec_rx_sc *sc = find_rx_sc(&macsec->secy, sci);

sc = sc ? macsec_rxsc_get(sc) : NULL;

if (sc) {
Expand Down Expand Up @@ -1584,7 +1585,6 @@ static struct macsec_rx_sa *get_rxsa_from_nl(struct net *net,
return rx_sa;
}


static const struct nla_policy macsec_genl_policy[NUM_MACSEC_ATTR] = {
[MACSEC_ATTR_IFINDEX] = { .type = NLA_U32 },
[MACSEC_ATTR_RXSC_CONFIG] = { .type = NLA_NESTED },
Expand Down Expand Up @@ -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,
struct macsec_tx_sa_stats __percpu *pstats)
struct macsec_tx_sa_stats __percpu *pstats)
{
struct macsec_tx_sa_stats sum = {0, };
int cpu;
Expand All @@ -2176,7 +2176,7 @@ static int copy_tx_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, };
int cpu;
Expand All @@ -2202,7 +2202,7 @@ static int copy_rx_sa_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, };
int cpu;
Expand Down Expand Up @@ -2266,7 +2266,7 @@ static int copy_rx_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, };
int cpu;
Expand Down Expand Up @@ -2306,7 +2306,7 @@ static int copy_tx_sc_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, };
int cpu;
Expand Down Expand Up @@ -2962,13 +2962,11 @@ static int macsec_get_iflink(const struct net_device *dev)
return macsec_priv(dev)->real_dev->ifindex;
}


static int macsec_get_nest_level(struct net_device *dev)
{
return macsec_priv(dev)->nest_level;
}


static const struct net_device_ops macsec_netdev_ops = {
.ndo_init = macsec_dev_init,
.ndo_uninit = macsec_dev_uninit,
Expand Down

0 comments on commit 7979472

Please sign in to comment.