netfilter: ipset: Fix coding styles reported by checkpatch.pl

[firefly-linux-kernel-4.4.55.git] / net / netfilter / ipset / ip_set_hash_mac.c

diff --git a/net/netfilter/ipset/ip_set_hash_mac.c b/net/netfilter/ipset/ip_set_hash_mac.c
index 112aff3cda96f4bde88fab28e715b7dcef233cc4..f1e7d2c0f68531421189b38d251148bdc4d12c95 100644 (file)
--- a/net/netfilter/ipset/ip_set_hash_mac.c
+++ b/net/netfilter/ipset/ip_set_hash_mac.c
@@ -89,10 +89,10 @@ hash_mac4_kadt(struct ip_set *set, const struct sk_buff *skb,
                return 0;
 
        if (skb_mac_header(skb) < skb->head ||
-            (skb_mac_header(skb) + ETH_HLEN) > skb->data)
+           (skb_mac_header(skb) + ETH_HLEN) > skb->data)
                return -EINVAL;
 
-       memcpy(e.ether, eth_hdr(skb)->h_source, ETH_ALEN);
+       ether_addr_copy(e.ether, eth_hdr(skb)->h_source);
        if (memcmp(e.ether, invalid_ether, ETH_ALEN) == 0)
                return -EINVAL;
        return adtfn(set, &e, &ext, &opt->ext, opt->cmdflags);
@@ -116,7 +116,7 @@ hash_mac4_uadt(struct ip_set *set, struct nlattr *tb[],
        ret = ip_set_get_extensions(set, tb, &ext);
        if (ret)
                return ret;
-       memcpy(e.ether, nla_data(tb[IPSET_ATTR_ETHER]), ETH_ALEN);
+       ether_addr_copy(e.ether, nla_data(tb[IPSET_ATTR_ETHER]));
        if (memcmp(e.ether, invalid_ether, ETH_ALEN) == 0)
                return -IPSET_ERR_HASH_ELEM;