Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed net_device::{add|rem}_multi() to {add|remove}_multicast for consistency and clarity.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21008 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2007-05-04 06:57:26 +00:00
parent 246b7a47b9
commit 8c40c83fa1
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
headers/private/net/net_device.h
View File

@ -55,8 +55,10 @@ struct net_device_module_info {
status_t (*set_promiscuous)(struct net_device *device, bool promiscuous); status_t (*set_promiscuous)(struct net_device *device, bool promiscuous);
status_t (*set_media)(struct net_device *device, uint32 media); status_t (*set_media)(struct net_device *device, uint32 media);
status_t (*add_multi)(struct net_device *device, const sockaddr *); status_t (*add_multicast)(struct net_device *device,
status_t (*rem_multi)(struct net_device *device, const sockaddr *); const sockaddr *address);
status_t (*remove_multicast)(struct net_device *device,
const sockaddr *address);
}; };
#endif // NET_DEVICE_H #endif // NET_DEVICE_H

8
src/add-ons/kernel/network/devices/ethernet/ethernet.cpp
View File

@ -380,7 +380,7 @@ ethernet_set_media(net_device *device, uint32 media)
status_t status_t
ethernet_add_multi(struct net_device *_device, const sockaddr *_address) ethernet_add_multicast(struct net_device *_device, const sockaddr *_address)
{ {
ethernet_device *device = (ethernet_device *)_device; ethernet_device *device = (ethernet_device *)_device;
@ -396,7 +396,7 @@ ethernet_add_multi(struct net_device *_device, const sockaddr *_address)
status_t status_t
ethernet_rem_multi(struct net_device *_device, const sockaddr *_address) ethernet_remove_multicast(struct net_device *_device, const sockaddr *_address)
{ {
ethernet_device *device = (ethernet_device *)_device; ethernet_device *device = (ethernet_device *)_device;
@ -477,8 +477,8 @@ net_device_module_info sEthernetModule = {
ethernet_set_mtu, ethernet_set_mtu,
ethernet_set_promiscuous, ethernet_set_promiscuous,
ethernet_set_media, ethernet_set_media,
ethernet_add_multi, ethernet_add_multicast,
ethernet_rem_multi, ethernet_remove_multicast,
}; };
module_info *modules[] = { module_info *modules[] = {

10
src/add-ons/kernel/network/devices/loopback/loopback.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2006, Haiku, Inc. All Rights Reserved. * Copyright 2006-2007, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@ -193,14 +193,14 @@ loopback_set_media(net_device *device, uint32 media)
status_t status_t
loopback_add_multi(net_device *device, const sockaddr *address) loopback_add_multicast(net_device *device, const sockaddr *address)
{ {
return B_OK; return B_OK;
} }
status_t status_t
loopback_rem_multi(net_device *device, const sockaddr *address) loopback_remove_multicast(net_device *device, const sockaddr *address)
{ {
return B_OK; return B_OK;
} }
@ -236,8 +236,8 @@ net_device_module_info sLoopbackModule = {
loopback_set_mtu, loopback_set_mtu,
loopback_set_promiscuous, loopback_set_promiscuous,
loopback_set_media, loopback_set_media,
loopback_add_multi, loopback_add_multicast,
loopback_rem_multi, loopback_remove_multicast,
}; };
module_info *modules[] = { module_info *modules[] = {

8
src/add-ons/kernel/network/stack/datalink.cpp
View File

@ -4,6 +4,7 @@
* *
* Authors: * Authors:
* Axel Dörfler, axeld@pinc-software.de * Axel Dörfler, axeld@pinc-software.de
* Hugo Santos, hugosantos@gmail.com
*/ */
@ -804,7 +805,8 @@ interface_protocol_join_multicast(net_datalink_protocol *_protocol,
const sockaddr *address) const sockaddr *address)
{ {
interface_protocol *protocol = (interface_protocol *)_protocol; interface_protocol *protocol = (interface_protocol *)_protocol;
return protocol->device_module->add_multi(protocol->device, address);
return protocol->device_module->add_multicast(protocol->device, address);
} }
@ -813,7 +815,9 @@ interface_protocol_leave_multicast(net_datalink_protocol *_protocol,
const sockaddr *address) const sockaddr *address)
{ {
interface_protocol *protocol = (interface_protocol *)_protocol; interface_protocol *protocol = (interface_protocol *)_protocol;
return protocol->device_module->rem_multi(protocol->device, address);
return protocol->device_module->remove_multicast(protocol->device,
address);
} }