aboutsummaryrefslogtreecommitdiffstats
path: root/net/atm/mpc.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-15 00:11:29 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:22:55 -0500
commit30d492da738a8d5f4ec884b3e1a13eef97714994 (patch)
tree6184b7fd083a41315ce84379fae0faf0c1749462 /net/atm/mpc.c
parent42d224aa170a4f7446cea6c972d9302d524545e5 (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/mpc.c')
-rw-r--r--net/atm/mpc.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 0d2b994af511..f15f5d847860 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -152,7 +152,7 @@ static struct mpoa_client *find_mpc_by_lec(struct net_device *dev)
152/* 152/*
153 * Overwrites the old entry or makes a new one. 153 * Overwrites the old entry or makes a new one.
154 */ 154 */
155struct atm_mpoa_qos *atm_mpoa_add_qos(uint32_t dst_ip, struct atm_qos *qos) 155struct atm_mpoa_qos *atm_mpoa_add_qos(__be32 dst_ip, struct atm_qos *qos)
156{ 156{
157 struct atm_mpoa_qos *entry; 157 struct atm_mpoa_qos *entry;
158 158
@@ -177,7 +177,7 @@ struct atm_mpoa_qos *atm_mpoa_add_qos(uint32_t dst_ip, struct atm_qos *qos)
177 return entry; 177 return entry;
178} 178}
179 179
180struct atm_mpoa_qos *atm_mpoa_search_qos(uint32_t dst_ip) 180struct atm_mpoa_qos *atm_mpoa_search_qos(__be32 dst_ip)
181{ 181{
182 struct atm_mpoa_qos *qos; 182 struct atm_mpoa_qos *qos;
183 183
@@ -460,11 +460,11 @@ static int send_via_shortcut(struct sk_buff *skb, struct mpoa_client *mpc)
460 in_cache_entry *entry; 460 in_cache_entry *entry;
461 struct iphdr *iph; 461 struct iphdr *iph;
462 char *buff; 462 char *buff;
463 uint32_t ipaddr = 0; 463 __be32 ipaddr = 0;
464 464
465 static struct { 465 static struct {
466 struct llc_snap_hdr hdr; 466 struct llc_snap_hdr hdr;
467 uint32_t tag; 467 __be32 tag;
468 } tagged_llc_snap_hdr = { 468 } tagged_llc_snap_hdr = {
469 {0xaa, 0xaa, 0x03, {0x00, 0x00, 0x00}, {0x88, 0x4c}}, 469 {0xaa, 0xaa, 0x03, {0x00, 0x00, 0x00}, {0x88, 0x4c}},
470 0 470 0
@@ -559,7 +559,7 @@ static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)
559 struct mpoa_client *mpc; 559 struct mpoa_client *mpc;
560 struct atmmpc_ioc ioc_data; 560 struct atmmpc_ioc ioc_data;
561 in_cache_entry *in_entry; 561 in_cache_entry *in_entry;
562 uint32_t ipaddr; 562 __be32 ipaddr;
563 563
564 bytes_left = copy_from_user(&ioc_data, arg, sizeof(struct atmmpc_ioc)); 564 bytes_left = copy_from_user(&ioc_data, arg, sizeof(struct atmmpc_ioc));
565 if (bytes_left != 0) { 565 if (bytes_left != 0) {
@@ -638,7 +638,7 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
638 struct sk_buff *new_skb; 638 struct sk_buff *new_skb;
639 eg_cache_entry *eg; 639 eg_cache_entry *eg;
640 struct mpoa_client *mpc; 640 struct mpoa_client *mpc;
641 uint32_t tag; 641 __be32 tag;
642 char *tmp; 642 char *tmp;
643 643
644 ddprintk("mpoa: (%s) mpc_push:\n", dev->name); 644 ddprintk("mpoa: (%s) mpc_push:\n", dev->name);
@@ -683,7 +683,7 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb)
683 } 683 }
684 684
685 tmp = skb->data + sizeof(struct llc_snap_hdr); 685 tmp = skb->data + sizeof(struct llc_snap_hdr);
686 tag = *(uint32_t *)tmp; 686 tag = *(__be32 *)tmp;
687 687
688 eg = mpc->eg_ops->get_by_tag(tag, mpc); 688 eg = mpc->eg_ops->get_by_tag(tag, mpc);
689 if (eg == NULL) { 689 if (eg == NULL) {
@@ -1029,7 +1029,7 @@ static int mpoa_event_listener(struct notifier_block *mpoa_notifier, unsigned lo
1029 1029
1030static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc) 1030static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1031{ 1031{
1032 uint32_t dst_ip = msg->content.in_info.in_dst_ip; 1032 __be32 dst_ip = msg->content.in_info.in_dst_ip;
1033 in_cache_entry *entry; 1033 in_cache_entry *entry;
1034 1034
1035 entry = mpc->in_ops->get(dst_ip, mpc); 1035 entry = mpc->in_ops->get(dst_ip, mpc);
@@ -1066,7 +1066,7 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1066 */ 1066 */
1067static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_client *client, in_cache_entry *entry) 1067static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_client *client, in_cache_entry *entry)
1068{ 1068{
1069 uint32_t dst_ip = msg->content.in_info.in_dst_ip; 1069 __be32 dst_ip = msg->content.in_info.in_dst_ip;
1070 struct atm_mpoa_qos *qos = atm_mpoa_search_qos(dst_ip); 1070 struct atm_mpoa_qos *qos = atm_mpoa_search_qos(dst_ip);
1071 eg_cache_entry *eg_entry = client->eg_ops->get_by_src_ip(dst_ip, client); 1071 eg_cache_entry *eg_entry = client->eg_ops->get_by_src_ip(dst_ip, client);
1072 1072
@@ -1102,7 +1102,7 @@ static void check_qos_and_open_shortcut(struct k_message *msg, struct mpoa_clien
1102 1102
1103static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc) 1103static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1104{ 1104{
1105 uint32_t dst_ip = msg->content.in_info.in_dst_ip; 1105 __be32 dst_ip = msg->content.in_info.in_dst_ip;
1106 in_cache_entry *entry = mpc->in_ops->get(dst_ip, mpc); 1106 in_cache_entry *entry = mpc->in_ops->get(dst_ip, mpc);
1107 1107
1108 dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %u.%u.%u.%u\n", mpc->dev->name, NIPQUAD(dst_ip)); 1108 dprintk("mpoa: (%s) MPOA_res_reply_rcvd: ip %u.%u.%u.%u\n", mpc->dev->name, NIPQUAD(dst_ip));
@@ -1148,8 +1148,8 @@ static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1148 1148
1149static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) 1149static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1150{ 1150{
1151 uint32_t dst_ip = msg->content.in_info.in_dst_ip; 1151 __be32 dst_ip = msg->content.in_info.in_dst_ip;
1152 uint32_t mask = msg->ip_mask; 1152 __be32 mask = msg->ip_mask;
1153 in_cache_entry *entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask); 1153 in_cache_entry *entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask);
1154 1154
1155 if(entry == NULL){ 1155 if(entry == NULL){
@@ -1173,7 +1173,7 @@ static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1173 1173
1174static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) 1174static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc)
1175{ 1175{
1176 uint32_t cache_id = msg->content.eg_info.cache_id; 1176 __be32 cache_id = msg->content.eg_info.cache_id;
1177 eg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(cache_id, mpc); 1177 eg_cache_entry *entry = mpc->eg_ops->get_by_cache_id(cache_id, mpc);
1178 1178
1179 if (entry == NULL) { 1179 if (entry == NULL) {