diff options
| author | Mitchell Blank Jr. <mitch@sfgoth.com> | 2002-06-08 20:24:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-08 20:24:15 -0700 |
| commit | dce2f963e28e62f2e961d13d41015059a226acee (patch) | |
| tree | bbf43220e0fc0e01a8359ed8152fb756143e1b81 /net | |
| parent | 685876620203668ab4bcab66ef575e4c3f2f30d1 (diff) | |
[PATCH] atm warning fix (vs 2.5.21)
This fixes a large batch of warnings that popped up with the new stricter
bitops.h that recently was introduced. We actually didn't have 64-bit
bug, but we had built our own *_flags_t typedef's that were just struct
wrappers around an unsigned long. We used to pass their addresses directly
to set_bit() and friends but now that causes an error. The typedef's really
didn't serve much purpose so the cleanest fix is to just eliminate them and
use "unsigned long" directly.
Diffstat (limited to 'net')
| -rw-r--r-- | net/atm/clip.c | 2 | ||||
| -rw-r--r-- | net/atm/lec.c | 2 | ||||
| -rw-r--r-- | net/atm/proc.c | 2 | ||||
| -rw-r--r-- | net/atm/resources.c | 2 | ||||
| -rw-r--r-- | net/atm/signaling.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index c467acbe633d..3ae5ae8757aa 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c @@ -710,7 +710,7 @@ static struct atm_dev atmarpd_dev = { 999, /* dummy device number */ NULL,NULL, /* pretend not to have any VCCs */ NULL,NULL, /* no data */ - { 0 }, /* no flags */ + 0, /* no flags */ NULL, /* no local address */ { 0 } /* no ESI, no statistics */ }; diff --git a/net/atm/lec.c b/net/atm/lec.c index e481864a9f61..6d9f865720cd 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -564,7 +564,7 @@ static struct atm_dev lecatm_dev = { 999, /*dummy device number*/ NULL,NULL, /*no VCCs*/ NULL,NULL, /*no data*/ - { 0 }, /*no flags*/ + 0, /*no flags*/ NULL, /* no local address*/ { 0 } /*no ESI or rest of the atm_dev struct things*/ }; diff --git a/net/atm/proc.c b/net/atm/proc.c index e19a6a69a0a4..bc11d58e7931 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c @@ -220,7 +220,7 @@ static void vc_info(struct atm_vcc *vcc,char *buf) default: here += sprintf(here,"%3d",vcc->family); } - here += sprintf(here," %04lx %5d %7d/%7d %7d/%7d\n",vcc->flags.bits, + here += sprintf(here," %04lx %5d %7d/%7d %7d/%7d\n",vcc->flags, vcc->reply, atomic_read(&vcc->tx_inuse),vcc->sk->sndbuf, atomic_read(&vcc->rx_inuse),vcc->sk->rcvbuf); diff --git a/net/atm/resources.c b/net/atm/resources.c index 3857176cc8bc..6a0ce727a8d0 100644 --- a/net/atm/resources.c +++ b/net/atm/resources.c @@ -83,7 +83,7 @@ struct atm_dev *atm_find_dev(int number) struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, - int number, atm_dev_flags_t *flags) + int number, unsigned long *flags) { struct atm_dev *dev; diff --git a/net/atm/signaling.c b/net/atm/signaling.c index 278317ca8a85..2d27f200c901 100644 --- a/net/atm/signaling.c +++ b/net/atm/signaling.c @@ -239,7 +239,7 @@ static struct atm_dev sigd_dev = { 999, /* dummy device number */ NULL,NULL, /* pretend not to have any VCCs */ NULL,NULL, /* no data */ - { 0 }, /* no flags */ + 0, /* no flags */ NULL, /* no local address */ { 0 } /* no ESI, no statistics */ }; |