diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-11-15 00:11:29 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:22:55 -0500 |
commit | 30d492da738a8d5f4ec884b3e1a13eef97714994 (patch) | |
tree | 6184b7fd083a41315ce84379fae0faf0c1749462 /net/atm/lec.c | |
parent | 42d224aa170a4f7446cea6c972d9302d524545e5 (diff) |
[ATM]: Annotations.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm/lec.c')
-rw-r--r-- | net/atm/lec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index 66c57c1091a8..9f5f931743bd 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -204,9 +204,9 @@ static unsigned char *get_tr_dst(unsigned char *packet, unsigned char *rdesc) | |||
204 | memset(rdesc, 0, ETH_ALEN); | 204 | memset(rdesc, 0, ETH_ALEN); |
205 | /* offset 4 comes from LAN destination field in LE control frames */ | 205 | /* offset 4 comes from LAN destination field in LE control frames */ |
206 | if (trh->rcf & htons((uint16_t) TR_RCF_DIR_BIT)) | 206 | if (trh->rcf & htons((uint16_t) TR_RCF_DIR_BIT)) |
207 | memcpy(&rdesc[4], &trh->rseg[num_rdsc - 2], sizeof(uint16_t)); | 207 | memcpy(&rdesc[4], &trh->rseg[num_rdsc - 2], sizeof(__be16)); |
208 | else { | 208 | else { |
209 | memcpy(&rdesc[4], &trh->rseg[1], sizeof(uint16_t)); | 209 | memcpy(&rdesc[4], &trh->rseg[1], sizeof(__be16)); |
210 | rdesc[5] = ((ntohs(trh->rseg[0]) & 0x000f) | (rdesc[5] & 0xf0)); | 210 | rdesc[5] = ((ntohs(trh->rseg[0]) & 0x000f) | (rdesc[5] & 0xf0)); |
211 | } | 211 | } |
212 | 212 | ||
@@ -775,7 +775,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buff *skb) | |||
775 | unsigned char *src, *dst; | 775 | unsigned char *src, *dst; |
776 | 776 | ||
777 | atm_return(vcc, skb->truesize); | 777 | atm_return(vcc, skb->truesize); |
778 | if (*(uint16_t *) skb->data == htons(priv->lecid) || | 778 | if (*(__be16 *) skb->data == htons(priv->lecid) || |
779 | !priv->lecd || !(dev->flags & IFF_UP)) { | 779 | !priv->lecd || !(dev->flags & IFF_UP)) { |
780 | /* | 780 | /* |
781 | * Probably looping back, or if lecd is missing, | 781 | * Probably looping back, or if lecd is missing, |