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/clip.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/clip.c')
-rw-r--r-- | net/atm/clip.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index 7af2c411da82..1c416934b7c1 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
@@ -54,7 +54,7 @@ static struct atm_vcc *atmarpd; | |||
54 | static struct neigh_table clip_tbl; | 54 | static struct neigh_table clip_tbl; |
55 | static struct timer_list idle_timer; | 55 | static struct timer_list idle_timer; |
56 | 56 | ||
57 | static int to_atmarpd(enum atmarp_ctrl_type type, int itf, unsigned long ip) | 57 | static int to_atmarpd(enum atmarp_ctrl_type type, int itf, __be32 ip) |
58 | { | 58 | { |
59 | struct sock *sk; | 59 | struct sock *sk; |
60 | struct atmarp_ctrl *ctrl; | 60 | struct atmarp_ctrl *ctrl; |
@@ -220,7 +220,7 @@ static void clip_push(struct atm_vcc *vcc, struct sk_buff *skb) | |||
220 | || memcmp(skb->data, llc_oui, sizeof (llc_oui))) | 220 | || memcmp(skb->data, llc_oui, sizeof (llc_oui))) |
221 | skb->protocol = htons(ETH_P_IP); | 221 | skb->protocol = htons(ETH_P_IP); |
222 | else { | 222 | else { |
223 | skb->protocol = ((u16 *) skb->data)[3]; | 223 | skb->protocol = ((__be16 *) skb->data)[3]; |
224 | skb_pull(skb, RFC1483LLC_LEN); | 224 | skb_pull(skb, RFC1483LLC_LEN); |
225 | if (skb->protocol == htons(ETH_P_ARP)) { | 225 | if (skb->protocol == htons(ETH_P_ARP)) { |
226 | PRIV(skb->dev)->stats.rx_packets++; | 226 | PRIV(skb->dev)->stats.rx_packets++; |
@@ -430,7 +430,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
430 | 430 | ||
431 | here = skb_push(skb, RFC1483LLC_LEN); | 431 | here = skb_push(skb, RFC1483LLC_LEN); |
432 | memcpy(here, llc_oui, sizeof(llc_oui)); | 432 | memcpy(here, llc_oui, sizeof(llc_oui)); |
433 | ((u16 *) here)[3] = skb->protocol; | 433 | ((__be16 *) here)[3] = skb->protocol; |
434 | } | 434 | } |
435 | atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); | 435 | atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); |
436 | ATM_SKB(skb)->atm_options = vcc->atm_options; | 436 | ATM_SKB(skb)->atm_options = vcc->atm_options; |
@@ -509,7 +509,7 @@ static int clip_mkip(struct atm_vcc *vcc, int timeout) | |||
509 | return 0; | 509 | return 0; |
510 | } | 510 | } |
511 | 511 | ||
512 | static int clip_setentry(struct atm_vcc *vcc, u32 ip) | 512 | static int clip_setentry(struct atm_vcc *vcc, __be32 ip) |
513 | { | 513 | { |
514 | struct neighbour *neigh; | 514 | struct neighbour *neigh; |
515 | struct atmarp_entry *entry; | 515 | struct atmarp_entry *entry; |
@@ -752,7 +752,7 @@ static int clip_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
752 | err = clip_mkip(vcc, arg); | 752 | err = clip_mkip(vcc, arg); |
753 | break; | 753 | break; |
754 | case ATMARP_SETENTRY: | 754 | case ATMARP_SETENTRY: |
755 | err = clip_setentry(vcc, arg); | 755 | err = clip_setentry(vcc, (__force __be32)arg); |
756 | break; | 756 | break; |
757 | case ATMARP_ENCAP: | 757 | case ATMARP_ENCAP: |
758 | err = clip_encap(vcc, arg); | 758 | err = clip_encap(vcc, arg); |