summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/net/if_media.c47
1 files changed, 12 insertions, 35 deletions
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index b6dbadb3428..dcad56a2789 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_media.c,v 1.14 2005/07/05 01:48:49 brad Exp $ */
+/* $OpenBSD: if_media.c,v 1.15 2005/07/09 21:23:45 brad Exp $ */
/* $NetBSD: if_media.c,v 1.10 2000/03/13 23:52:39 soren Exp $ */
/*-
@@ -110,13 +110,9 @@ static void ifmedia_printword(int);
* Initialize if_media struct for a specific interface instance.
*/
void
-ifmedia_init(ifm, dontcare_mask, change_callback, status_callback)
- struct ifmedia *ifm;
- int dontcare_mask;
- ifm_change_cb_t change_callback;
- ifm_stat_cb_t status_callback;
+ifmedia_init(struct ifmedia *ifm, int dontcare_mask,
+ ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback)
{
-
TAILQ_INIT(&ifm->ifm_list);
ifm->ifm_cur = NULL;
ifm->ifm_media = 0;
@@ -130,11 +126,7 @@ ifmedia_init(ifm, dontcare_mask, change_callback, status_callback)
* for a specific interface instance.
*/
void
-ifmedia_add(ifm, mword, data, aux)
- struct ifmedia *ifm;
- int mword;
- int data;
- void *aux;
+ifmedia_add(struct ifmedia *ifm, int mword, int data, void *aux)
{
struct ifmedia_entry *entry;
@@ -165,10 +157,7 @@ ifmedia_add(ifm, mword, data, aux)
* supported media for a specific interface instance.
*/
void
-ifmedia_list_add(ifm, lp, count)
- struct ifmedia *ifm;
- struct ifmedia_entry *lp;
- int count;
+ifmedia_list_add(struct ifmedia *ifm, struct ifmedia_entry *lp, int count)
{
int i;
@@ -185,9 +174,7 @@ ifmedia_list_add(ifm, lp, count)
* media-change callback.
*/
void
-ifmedia_set(ifm, target)
- struct ifmedia *ifm;
- int target;
+ifmedia_set(struct ifmedia *ifm, int target)
{
struct ifmedia_entry *match;
@@ -236,11 +223,8 @@ ifmedia_set(ifm, target)
* Device-independent media ioctl support function.
*/
int
-ifmedia_ioctl(ifp, ifr, ifm, cmd)
- struct ifnet *ifp;
- struct ifreq *ifr;
- struct ifmedia *ifm;
- u_long cmd;
+ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm,
+ u_long cmd)
{
struct ifmedia_entry *match;
struct ifmediareq *ifmr = (struct ifmediareq *) ifr;
@@ -368,10 +352,7 @@ ifmedia_ioctl(ifp, ifr, ifm, cmd)
* Find media entry matching a given ifm word.
*/
struct ifmedia_entry *
-ifmedia_match(ifm, target, mask)
- struct ifmedia *ifm;
- u_int target;
- u_int mask;
+ifmedia_match(struct ifmedia *ifm, u_int target, u_int mask)
{
struct ifmedia_entry *match, *next;
@@ -398,9 +379,7 @@ ifmedia_match(ifm, target, mask)
* Delete all media for a given instance.
*/
void
-ifmedia_delete_instance(ifm, inst)
- struct ifmedia *ifm;
- u_int inst;
+ifmedia_delete_instance(struct ifmedia *ifm, u_int inst)
{
struct ifmedia_entry *ife, *nife;
@@ -423,8 +402,7 @@ struct ifmedia_baudrate ifmedia_baudrate_descriptions[] =
IFM_BAUDRATE_DESCRIPTIONS;
int
-ifmedia_baudrate(mword)
- int mword;
+ifmedia_baudrate(int mword)
{
int i;
@@ -453,8 +431,7 @@ struct ifmedia_description ifm_option_descriptions[] =
* print a media word.
*/
static void
-ifmedia_printword(ifmw)
- int ifmw;
+ifmedia_printword(int ifmw)
{
struct ifmedia_description *desc;
int seen_option = 0;