2007-02-08 22:31:59

by Jeff Garzik

[permalink] [raw]
Subject: gigaset build broken on current linux-2.6.git

Fedora Core 6, x86-64, make allyesconfig:

[jgarzik@pretzel linux-2.6]$ make -sj4
CHK include/linux/version.h
CHK include/linux/utsrelease.h
CHK include/linux/compile.h
drivers/isdn/gigaset/bas-gigaset.c: In function ?dump_urb?:
drivers/isdn/gigaset/bas-gigaset.c:258: error: ?struct urb? has no
member named ?bandwidth?
make[3]: *** [drivers/isdn/gigaset/bas-gigaset.o] Error 1
make[2]: *** [drivers/isdn/gigaset] Error 2
make[1]: *** [drivers/isdn] Error 2


2007-02-08 22:46:57

by Jiri Kosina

[permalink] [raw]
Subject: Re: gigaset build broken on current linux-2.6.git

On Thu, 8 Feb 2007, Jeff Garzik wrote:

> [jgarzik@pretzel linux-2.6]$ make -sj4
> CHK include/linux/version.h
> CHK include/linux/utsrelease.h
> CHK include/linux/compile.h
> drivers/isdn/gigaset/bas-gigaset.c: In function 'dump_urb':
> drivers/isdn/gigaset/bas-gigaset.c:258: error: 'struct urb' has no member
> named 'bandwidth'

ISDN: gigaset - remove forgotten urb->bandwidth reference

Recent changes in usbcore removed the bandwidth field from struct urb.
Remove the forgotten occurence in bas-gigaset.c

Signed-off-by: Jiri Kosina <[email protected]>

---

drivers/isdn/gigaset/bas-gigaset.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index b5e7f9c..63e51dd 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -257,10 +257,10 @@ static inline void dump_urb(enum debuglevel level, const char *tag,
urb->transfer_flags);
gig_dbg(level,
" transfer_buffer=0x%08lx[%d], actual_length=%d, "
- "bandwidth=%d, setup_packet=0x%08lx,",
+ "setup_packet=0x%08lx,",
(unsigned long) urb->transfer_buffer,
urb->transfer_buffer_length, urb->actual_length,
- urb->bandwidth, (unsigned long) urb->setup_packet);
+ (unsigned long) urb->setup_packet);
gig_dbg(level,
" start_frame=%d, number_of_packets=%d, interval=%d, "
"error_count=%d,",

--
Jiri Kosina

2007-02-09 08:30:31

by Tilman Schmidt

[permalink] [raw]
Subject: Re: gigaset build broken on current linux-2.6.git

Jiri Kosina schrieb:
> On Thu, 8 Feb 2007, Jeff Garzik wrote:
>
>> [jgarzik@pretzel linux-2.6]$ make -sj4
>> CHK include/linux/version.h
>> CHK include/linux/utsrelease.h
>> CHK include/linux/compile.h
>> drivers/isdn/gigaset/bas-gigaset.c: In function 'dump_urb':
>> drivers/isdn/gigaset/bas-gigaset.c:258: error: 'struct urb' has no member
>> named 'bandwidth'
>
> ISDN: gigaset - remove forgotten urb->bandwidth reference
>
> Recent changes in usbcore removed the bandwidth field from struct urb.
> Remove the forgotten occurence in bas-gigaset.c
>
> Signed-off-by: Jiri Kosina <[email protected]>
Signed-off-by: Tilman Schmidt <[email protected]>

Use this or one of the two identical patches I already submitted for that.

> ---
>
> drivers/isdn/gigaset/bas-gigaset.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
> index b5e7f9c..63e51dd 100644
> --- a/drivers/isdn/gigaset/bas-gigaset.c
> +++ b/drivers/isdn/gigaset/bas-gigaset.c
> @@ -257,10 +257,10 @@ static inline void dump_urb(enum debuglevel level, const char *tag,
> urb->transfer_flags);
> gig_dbg(level,
> " transfer_buffer=0x%08lx[%d], actual_length=%d, "
> - "bandwidth=%d, setup_packet=0x%08lx,",
> + "setup_packet=0x%08lx,",
> (unsigned long) urb->transfer_buffer,
> urb->transfer_buffer_length, urb->actual_length,
> - urb->bandwidth, (unsigned long) urb->setup_packet);
> + (unsigned long) urb->setup_packet);
> gig_dbg(level,
> " start_frame=%d, number_of_packets=%d, interval=%d, "
> "error_count=%d,",
>


--
Tilman Schmidt E-Mail: [email protected]
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Unge?ffnet mindestens haltbar bis: (siehe R?ckseite)


Attachments:
signature.asc (250.00 B)
OpenPGP digital signature

2007-02-11 18:39:19

by Tilman Schmidt

[permalink] [raw]
Subject: Re: gigaset build broken on current linux-2.6.git

On Thu, 08 Feb 2007 14:02:31 +0100 I wrote:
> Subject: Re: [linux-usb-devel] [PATCH 41/70] usbcore: remove unused bandwith-related code
>
> This breaks compilation of drivers/isdn/gigaset/bas-gigaset.c.
> If you pass on this patch, please pass on Andrew's
>
> fix-gregkh-usb-usbcore-remove-unused-bandwith-related-code.patch
>
> along with it.

On Fri, 09 Feb 2007 09:30:01 +0100, I wrote:
> Jiri Kosina schrieb:
>> ISDN: gigaset - remove forgotten urb->bandwidth reference
>>
>> Recent changes in usbcore removed the bandwidth field from struct urb.
>> Remove the forgotten occurence in bas-gigaset.c
>>
>> Signed-off-by: Jiri Kosina <[email protected]>
> Signed-off-by: Tilman Schmidt <[email protected]>

I notice that 2.6.20-git6 still doesn't include either of these fixes.
Is there anything I need to do in order to push it?

Thanks,
Tilman

--
Tilman Schmidt E-Mail: [email protected]
Bonn, Germany
- In theory, there is no difference between theory and practice.
In practice, there is.


Attachments:
signature.asc (253.00 B)
OpenPGP digital signature

2007-02-11 18:48:56

by Greg KH

[permalink] [raw]
Subject: Re: gigaset build broken on current linux-2.6.git

On Sun, Feb 11, 2007 at 07:40:15PM +0100, Tilman Schmidt wrote:
> On Thu, 08 Feb 2007 14:02:31 +0100 I wrote:
> > Subject: Re: [linux-usb-devel] [PATCH 41/70] usbcore: remove unused bandwith-related code
> >
> > This breaks compilation of drivers/isdn/gigaset/bas-gigaset.c.
> > If you pass on this patch, please pass on Andrew's
> >
> > fix-gregkh-usb-usbcore-remove-unused-bandwith-related-code.patch
> >
> > along with it.
>
> On Fri, 09 Feb 2007 09:30:01 +0100, I wrote:
> > Jiri Kosina schrieb:
> >> ISDN: gigaset - remove forgotten urb->bandwidth reference
> >>
> >> Recent changes in usbcore removed the bandwidth field from struct urb.
> >> Remove the forgotten occurence in bas-gigaset.c
> >>
> >> Signed-off-by: Jiri Kosina <[email protected]>
> > Signed-off-by: Tilman Schmidt <[email protected]>
>
> I notice that 2.6.20-git6 still doesn't include either of these fixes.
> Is there anything I need to do in order to push it?

It's in my queue and is on track to get in before 2.6.21-rc1 is out.

thanks,

greg k-h

2007-02-12 06:17:03

by Jeff Garzik

[permalink] [raw]
Subject: Re: gigaset build broken on current linux-2.6.git

On Sun, Feb 11, 2007 at 10:47:27AM -0800, Greg KH wrote:
> It's in my queue and is on track to get in before 2.6.21-rc1 is out.

It breaks the build for everyone, please fast-forward the merging of
this.

Jeff



2007-02-12 18:38:39

by Greg KH

[permalink] [raw]
Subject: Re: gigaset build broken on current linux-2.6.git

On Mon, Feb 12, 2007 at 01:16:59AM -0500, Jeff Garzik wrote:
> On Sun, Feb 11, 2007 at 10:47:27AM -0800, Greg KH wrote:
> > It's in my queue and is on track to get in before 2.6.21-rc1 is out.
>
> It breaks the build for everyone, please fast-forward the merging of
> this.

It's now in Linus's tree thanks to Andrew.