diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-08 03:26:05 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:21:23 -0500 |
commit | 3fbd418acc264e7069483d04165633ed3bfad80c (patch) | |
tree | 21dd38111385737d35a1139705f29d008b28f0ba /net | |
parent | fede70b9862635ab1bed84ab3d765e9069616b02 (diff) |
[LLC]: anotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/llc/af_llc.c | 2 | ||||
-rw-r--r-- | net/llc/llc_input.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 2652ead96c64..190bb3e05188 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
@@ -64,7 +64,7 @@ static inline u16 llc_ui_next_link_no(int sap) | |||
64 | * | 64 | * |
65 | * Given an ARP header type return the corresponding ethernet protocol. | 65 | * Given an ARP header type return the corresponding ethernet protocol. |
66 | */ | 66 | */ |
67 | static inline u16 llc_proto_type(u16 arphrd) | 67 | static inline __be16 llc_proto_type(u16 arphrd) |
68 | { | 68 | { |
69 | return arphrd == ARPHRD_IEEE802_TR ? | 69 | return arphrd == ARPHRD_IEEE802_TR ? |
70 | htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); | 70 | htons(ETH_P_TR_802_2) : htons(ETH_P_802_2); |
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c index 94d2368ade92..db82aff6e40f 100644 --- a/net/llc/llc_input.c +++ b/net/llc/llc_input.c | |||
@@ -115,8 +115,8 @@ static inline int llc_fixup_skb(struct sk_buff *skb) | |||
115 | skb->h.raw += llc_len; | 115 | skb->h.raw += llc_len; |
116 | skb_pull(skb, llc_len); | 116 | skb_pull(skb, llc_len); |
117 | if (skb->protocol == htons(ETH_P_802_2)) { | 117 | if (skb->protocol == htons(ETH_P_802_2)) { |
118 | u16 pdulen = eth_hdr(skb)->h_proto, | 118 | __be16 pdulen = eth_hdr(skb)->h_proto; |
119 | data_size = ntohs(pdulen) - llc_len; | 119 | u16 data_size = ntohs(pdulen) - llc_len; |
120 | 120 | ||
121 | if (unlikely(pskb_trim_rcsum(skb, data_size))) | 121 | if (unlikely(pskb_trim_rcsum(skb, data_size))) |
122 | return 0; | 122 | return 0; |