diff options
Diffstat (limited to 'net/atm/mpc.c')
-rw-r--r-- | net/atm/mpc.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 436f2e177657..622b471e14e0 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
@@ -455,7 +455,6 @@ static void lane2_assoc_ind(struct net_device *dev, const u8 *mac_addr, | |||
455 | if (end_of_tlvs - tlvs != 0) | 455 | if (end_of_tlvs - tlvs != 0) |
456 | pr_info("(%s) ignoring %Zd bytes of trailing TLV garbage\n", | 456 | pr_info("(%s) ignoring %Zd bytes of trailing TLV garbage\n", |
457 | dev->name, end_of_tlvs - tlvs); | 457 | dev->name, end_of_tlvs - tlvs); |
458 | return; | ||
459 | } | 458 | } |
460 | 459 | ||
461 | /* | 460 | /* |
@@ -684,8 +683,6 @@ static void mpc_vcc_close(struct atm_vcc *vcc, struct net_device *dev) | |||
684 | 683 | ||
685 | if (in_entry == NULL && eg_entry == NULL) | 684 | if (in_entry == NULL && eg_entry == NULL) |
686 | dprintk("(%s) unused vcc closed\n", dev->name); | 685 | dprintk("(%s) unused vcc closed\n", dev->name); |
687 | |||
688 | return; | ||
689 | } | 686 | } |
690 | 687 | ||
691 | static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) | 688 | static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) |
@@ -783,8 +780,6 @@ static void mpc_push(struct atm_vcc *vcc, struct sk_buff *skb) | |||
783 | 780 | ||
784 | memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); | 781 | memset(ATM_SKB(skb), 0, sizeof(struct atm_skb_data)); |
785 | netif_rx(new_skb); | 782 | netif_rx(new_skb); |
786 | |||
787 | return; | ||
788 | } | 783 | } |
789 | 784 | ||
790 | static struct atmdev_ops mpc_ops = { /* only send is required */ | 785 | static struct atmdev_ops mpc_ops = { /* only send is required */ |
@@ -873,8 +868,6 @@ static void send_set_mps_ctrl_addr(const char *addr, struct mpoa_client *mpc) | |||
873 | mesg.type = SET_MPS_CTRL_ADDR; | 868 | mesg.type = SET_MPS_CTRL_ADDR; |
874 | memcpy(mesg.MPS_ctrl, addr, ATM_ESA_LEN); | 869 | memcpy(mesg.MPS_ctrl, addr, ATM_ESA_LEN); |
875 | msg_to_mpoad(&mesg, mpc); | 870 | msg_to_mpoad(&mesg, mpc); |
876 | |||
877 | return; | ||
878 | } | 871 | } |
879 | 872 | ||
880 | static void mpoad_close(struct atm_vcc *vcc) | 873 | static void mpoad_close(struct atm_vcc *vcc) |
@@ -911,8 +904,6 @@ static void mpoad_close(struct atm_vcc *vcc) | |||
911 | pr_info("(%s) going down\n", | 904 | pr_info("(%s) going down\n", |
912 | (mpc->dev) ? mpc->dev->name : "<unknown>"); | 905 | (mpc->dev) ? mpc->dev->name : "<unknown>"); |
913 | module_put(THIS_MODULE); | 906 | module_put(THIS_MODULE); |
914 | |||
915 | return; | ||
916 | } | 907 | } |
917 | 908 | ||
918 | /* | 909 | /* |
@@ -1122,7 +1113,6 @@ static void MPOA_trigger_rcvd(struct k_message *msg, struct mpoa_client *mpc) | |||
1122 | pr_info("(%s) entry already in resolving state\n", | 1113 | pr_info("(%s) entry already in resolving state\n", |
1123 | (mpc->dev) ? mpc->dev->name : "<unknown>"); | 1114 | (mpc->dev) ? mpc->dev->name : "<unknown>"); |
1124 | mpc->in_ops->put(entry); | 1115 | mpc->in_ops->put(entry); |
1125 | return; | ||
1126 | } | 1116 | } |
1127 | 1117 | ||
1128 | /* | 1118 | /* |
@@ -1166,7 +1156,6 @@ static void check_qos_and_open_shortcut(struct k_message *msg, | |||
1166 | } else | 1156 | } else |
1167 | memset(&msg->qos, 0, sizeof(struct atm_qos)); | 1157 | memset(&msg->qos, 0, sizeof(struct atm_qos)); |
1168 | msg_to_mpoad(msg, client); | 1158 | msg_to_mpoad(msg, client); |
1169 | return; | ||
1170 | } | 1159 | } |
1171 | 1160 | ||
1172 | static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc) | 1161 | static void MPOA_res_reply_rcvd(struct k_message *msg, struct mpoa_client *mpc) |
@@ -1240,8 +1229,6 @@ static void ingress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) | |||
1240 | mpc->in_ops->put(entry); | 1229 | mpc->in_ops->put(entry); |
1241 | entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask); | 1230 | entry = mpc->in_ops->get_with_mask(dst_ip, mpc, mask); |
1242 | } while (entry != NULL); | 1231 | } while (entry != NULL); |
1243 | |||
1244 | return; | ||
1245 | } | 1232 | } |
1246 | 1233 | ||
1247 | static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) | 1234 | static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) |
@@ -1260,8 +1247,6 @@ static void egress_purge_rcvd(struct k_message *msg, struct mpoa_client *mpc) | |||
1260 | write_unlock_irq(&mpc->egress_lock); | 1247 | write_unlock_irq(&mpc->egress_lock); |
1261 | 1248 | ||
1262 | mpc->eg_ops->put(entry); | 1249 | mpc->eg_ops->put(entry); |
1263 | |||
1264 | return; | ||
1265 | } | 1250 | } |
1266 | 1251 | ||
1267 | static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry) | 1252 | static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry) |
@@ -1295,8 +1280,6 @@ static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry) | |||
1295 | skb_queue_tail(&sk->sk_receive_queue, skb); | 1280 | skb_queue_tail(&sk->sk_receive_queue, skb); |
1296 | sk->sk_data_ready(sk, skb->len); | 1281 | sk->sk_data_ready(sk, skb->len); |
1297 | dprintk("exiting\n"); | 1282 | dprintk("exiting\n"); |
1298 | |||
1299 | return; | ||
1300 | } | 1283 | } |
1301 | 1284 | ||
1302 | /* | 1285 | /* |
@@ -1325,8 +1308,6 @@ static void mps_death(struct k_message *msg, struct mpoa_client *mpc) | |||
1325 | 1308 | ||
1326 | mpc->in_ops->destroy_cache(mpc); | 1309 | mpc->in_ops->destroy_cache(mpc); |
1327 | mpc->eg_ops->destroy_cache(mpc); | 1310 | mpc->eg_ops->destroy_cache(mpc); |
1328 | |||
1329 | return; | ||
1330 | } | 1311 | } |
1331 | 1312 | ||
1332 | static void MPOA_cache_impos_rcvd(struct k_message *msg, | 1313 | static void MPOA_cache_impos_rcvd(struct k_message *msg, |
@@ -1353,8 +1334,6 @@ static void MPOA_cache_impos_rcvd(struct k_message *msg, | |||
1353 | write_unlock_irq(&mpc->egress_lock); | 1334 | write_unlock_irq(&mpc->egress_lock); |
1354 | 1335 | ||
1355 | mpc->eg_ops->put(entry); | 1336 | mpc->eg_ops->put(entry); |
1356 | |||
1357 | return; | ||
1358 | } | 1337 | } |
1359 | 1338 | ||
1360 | static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, | 1339 | static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, |
@@ -1392,8 +1371,6 @@ static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, | |||
1392 | pr_info("(%s) targetless LE_ARP request failed\n", | 1371 | pr_info("(%s) targetless LE_ARP request failed\n", |
1393 | mpc->dev->name); | 1372 | mpc->dev->name); |
1394 | } | 1373 | } |
1395 | |||
1396 | return; | ||
1397 | } | 1374 | } |
1398 | 1375 | ||
1399 | static void set_mps_mac_addr_rcvd(struct k_message *msg, | 1376 | static void set_mps_mac_addr_rcvd(struct k_message *msg, |
@@ -1409,8 +1386,6 @@ static void set_mps_mac_addr_rcvd(struct k_message *msg, | |||
1409 | return; | 1386 | return; |
1410 | } | 1387 | } |
1411 | client->number_of_mps_macs = 1; | 1388 | client->number_of_mps_macs = 1; |
1412 | |||
1413 | return; | ||
1414 | } | 1389 | } |
1415 | 1390 | ||
1416 | /* | 1391 | /* |
@@ -1436,7 +1411,6 @@ static void clean_up(struct k_message *msg, struct mpoa_client *mpc, int action) | |||
1436 | 1411 | ||
1437 | msg->type = action; | 1412 | msg->type = action; |
1438 | msg_to_mpoad(msg, mpc); | 1413 | msg_to_mpoad(msg, mpc); |
1439 | return; | ||
1440 | } | 1414 | } |
1441 | 1415 | ||
1442 | static void mpc_timer_refresh(void) | 1416 | static void mpc_timer_refresh(void) |
@@ -1445,8 +1419,6 @@ static void mpc_timer_refresh(void) | |||
1445 | mpc_timer.data = mpc_timer.expires; | 1419 | mpc_timer.data = mpc_timer.expires; |
1446 | mpc_timer.function = mpc_cache_check; | 1420 | mpc_timer.function = mpc_cache_check; |
1447 | add_timer(&mpc_timer); | 1421 | add_timer(&mpc_timer); |
1448 | |||
1449 | return; | ||
1450 | } | 1422 | } |
1451 | 1423 | ||
1452 | static void mpc_cache_check(unsigned long checking_time) | 1424 | static void mpc_cache_check(unsigned long checking_time) |
@@ -1471,8 +1443,6 @@ static void mpc_cache_check(unsigned long checking_time) | |||
1471 | mpc = mpc->next; | 1443 | mpc = mpc->next; |
1472 | } | 1444 | } |
1473 | mpc_timer_refresh(); | 1445 | mpc_timer_refresh(); |
1474 | |||
1475 | return; | ||
1476 | } | 1446 | } |
1477 | 1447 | ||
1478 | static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd, | 1448 | static int atm_mpoa_ioctl(struct socket *sock, unsigned int cmd, |
@@ -1561,8 +1531,6 @@ static void __exit atm_mpoa_cleanup(void) | |||
1561 | kfree(qos); | 1531 | kfree(qos); |
1562 | qos = nextqos; | 1532 | qos = nextqos; |
1563 | } | 1533 | } |
1564 | |||
1565 | return; | ||
1566 | } | 1534 | } |
1567 | 1535 | ||
1568 | module_init(atm_mpoa_init); | 1536 | module_init(atm_mpoa_init); |