adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LLC]: anotations

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2006-11-08 00:26:05 -08:00 committed by David S. Miller
parent fede70b986
commit 3fbd418acc
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/net/llc_pdu.h
View file

@ -252,9 +252,9 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type,
*/ */
static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa) static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
{ {
if (skb->protocol == ntohs(ETH_P_802_2)) if (skb->protocol == htons(ETH_P_802_2))
memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN); memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);
else if (skb->protocol == ntohs(ETH_P_TR_802_2)) { else if (skb->protocol == htons(ETH_P_TR_802_2)) {
memcpy(sa, tr_hdr(skb)->saddr, ETH_ALEN); memcpy(sa, tr_hdr(skb)->saddr, ETH_ALEN);
*sa &= 0x7F; *sa &= 0x7F;
} }
@ -269,9 +269,9 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
*/ */
static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da) static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)
{ {
if (skb->protocol == ntohs(ETH_P_802_2)) if (skb->protocol == htons(ETH_P_802_2))
memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN); memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);
else if (skb->protocol == ntohs(ETH_P_TR_802_2)) else if (skb->protocol == htons(ETH_P_TR_802_2))
memcpy(da, tr_hdr(skb)->daddr, ETH_ALEN); memcpy(da, tr_hdr(skb)->daddr, ETH_ALEN);
} }
@ -345,7 +345,7 @@ static inline void llc_pdu_init_as_test_rsp(struct sk_buff *skb,
pdu->ctrl_1 = LLC_PDU_TYPE_U; pdu->ctrl_1 = LLC_PDU_TYPE_U;
pdu->ctrl_1 |= LLC_1_PDU_CMD_TEST; pdu->ctrl_1 |= LLC_1_PDU_CMD_TEST;
pdu->ctrl_1 |= LLC_U_PF_BIT_MASK; pdu->ctrl_1 |= LLC_U_PF_BIT_MASK;
if (ev_skb->protocol == ntohs(ETH_P_802_2)) { if (ev_skb->protocol == htons(ETH_P_802_2)) {
struct llc_pdu_un *ev_pdu = llc_pdu_un_hdr(ev_skb); struct llc_pdu_un *ev_pdu = llc_pdu_un_hdr(ev_skb);
int dsize; int dsize;

2
net/llc/af_llc.c
View file

@ -64,7 +64,7 @@ static inline u16 llc_ui_next_link_no(int sap)
* *
* Given an ARP header type return the corresponding ethernet protocol. * Given an ARP header type return the corresponding ethernet protocol.
*/ */
static inline u16 llc_proto_type(u16 arphrd) static inline __be16 llc_proto_type(u16 arphrd)
{ {
return arphrd == ARPHRD_IEEE802_TR ? return arphrd == ARPHRD_IEEE802_TR ?
htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);

4
net/llc/llc_input.c
View file

@ -115,8 +115,8 @@ static inline int llc_fixup_skb(struct sk_buff *skb)
skb->h.raw += llc_len; skb->h.raw += llc_len;
skb_pull(skb, llc_len); skb_pull(skb, llc_len);
if (skb->protocol == htons(ETH_P_802_2)) { if (skb->protocol == htons(ETH_P_802_2)) {
u16 pdulen = eth_hdr(skb)->h_proto, __be16 pdulen = eth_hdr(skb)->h_proto;
data_size = ntohs(pdulen) - llc_len; u16 data_size = ntohs(pdulen) - llc_len;
if (unlikely(pskb_trim_rcsum(skb, data_size))) if (unlikely(pskb_trim_rcsum(skb, data_size)))
return 0; return 0;