aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc/llc_sap.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-09-01 16:11:55 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-03 22:34:47 -0400
commit951fd874c3b014c4abf38a8e588d4687b98fedb4 (patch)
treee9a6215e7a00efe671471b3f8d6bf180572f5e0b /net/llc/llc_sap.c
parent7367d0b573d149550d2ae25c402984b98f8f422e (diff)
llc: Use normal etherdevice.h tests
Convert the llc_<foo> static inlines to the equivalents from etherdevice.h and remove the llc_<foo> static inline functions. llc_mac_null -> is_zero_ether_addr llc_mac_multicast -> is_multicast_ether_addr llc_mac_match -> ether_addr_equal Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/llc/llc_sap.c')
-rw-r--r--net/llc/llc_sap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 78be45cda5c1..e5850699098e 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -302,7 +302,7 @@ static inline bool llc_dgram_match(const struct llc_sap *sap,
302 302
303 return sk->sk_type == SOCK_DGRAM && 303 return sk->sk_type == SOCK_DGRAM &&
304 llc->laddr.lsap == laddr->lsap && 304 llc->laddr.lsap == laddr->lsap &&
305 llc_mac_match(llc->laddr.mac, laddr->mac); 305 ether_addr_equal(llc->laddr.mac, laddr->mac);
306} 306}
307 307
308/** 308/**
@@ -425,7 +425,7 @@ void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb)
425 llc_pdu_decode_da(skb, laddr.mac); 425 llc_pdu_decode_da(skb, laddr.mac);
426 llc_pdu_decode_dsap(skb, &laddr.lsap); 426 llc_pdu_decode_dsap(skb, &laddr.lsap);
427 427
428 if (llc_mac_multicast(laddr.mac)) { 428 if (is_multicast_ether_addr(laddr.mac)) {
429 llc_sap_mcast(sap, &laddr, skb); 429 llc_sap_mcast(sap, &laddr, skb);
430 kfree_skb(skb); 430 kfree_skb(skb);
431 } else { 431 } else {