diff options
author | Joe Perches <joe@perches.com> | 2013-09-01 16:11:55 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-03 22:34:47 -0400 |
commit | 951fd874c3b014c4abf38a8e588d4687b98fedb4 (patch) | |
tree | e9a6215e7a00efe671471b3f8d6bf180572f5e0b /net/llc/llc_conn.c | |
parent | 7367d0b573d149550d2ae25c402984b98f8f422e (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_conn.c')
-rw-r--r-- | net/llc/llc_conn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c index 0d0d416dfab6..cd8724177965 100644 --- a/net/llc/llc_conn.c +++ b/net/llc/llc_conn.c | |||
@@ -478,8 +478,8 @@ static inline bool llc_estab_match(const struct llc_sap *sap, | |||
478 | 478 | ||
479 | return llc->laddr.lsap == laddr->lsap && | 479 | return llc->laddr.lsap == laddr->lsap && |
480 | llc->daddr.lsap == daddr->lsap && | 480 | llc->daddr.lsap == daddr->lsap && |
481 | llc_mac_match(llc->laddr.mac, laddr->mac) && | 481 | ether_addr_equal(llc->laddr.mac, laddr->mac) && |
482 | llc_mac_match(llc->daddr.mac, daddr->mac); | 482 | ether_addr_equal(llc->daddr.mac, daddr->mac); |
483 | } | 483 | } |
484 | 484 | ||
485 | /** | 485 | /** |
@@ -550,7 +550,7 @@ static inline bool llc_listener_match(const struct llc_sap *sap, | |||
550 | 550 | ||
551 | return sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_LISTEN && | 551 | return sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_LISTEN && |
552 | llc->laddr.lsap == laddr->lsap && | 552 | llc->laddr.lsap == laddr->lsap && |
553 | llc_mac_match(llc->laddr.mac, laddr->mac); | 553 | ether_addr_equal(llc->laddr.mac, laddr->mac); |
554 | } | 554 | } |
555 | 555 | ||
556 | static struct sock *__llc_lookup_listener(struct llc_sap *sap, | 556 | static struct sock *__llc_lookup_listener(struct llc_sap *sap, |