linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] usb: gadget: ncm: correct endianess conversion
@ 2012-10-08 20:59 Dmytro Milinevskyy
  2012-10-24 13:58 ` Sebastian Andrzej Siewior
  0 siblings, 1 reply; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-10-08 20:59 UTC (permalink / raw)
  To: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel
  Cc: Dmytro Milinevskyy

Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
Tested on MIPS32 big-endian device.

Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
---
 drivers/usb/gadget/f_ncm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index b651b52..fce45ab 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -869,11 +869,11 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
 	struct sk_buff	*skb2;
 	int		ncb_len = 0;
 	__le16		*tmp;
-	int		div = ntb_parameters.wNdpInDivisor;
-	int		rem = ntb_parameters.wNdpInPayloadRemainder;
-	int		pad;
-	int		ndp_align = ntb_parameters.wNdpInAlignment;
-	int		ndp_pad;
+	int	div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
+	int	rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
+	int	pad;
+	int	ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
+	int	ndp_pad;
 	unsigned	max_size = ncm->port.fixed_in_len;
 	struct ndp_parser_opts *opts = ncm->parser_opts;
 	unsigned	crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
-- 
1.7.12.2


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-10-08 20:59 [PATCH] usb: gadget: ncm: correct endianess conversion Dmytro Milinevskyy
@ 2012-10-24 13:58 ` Sebastian Andrzej Siewior
  2012-10-28 17:30   ` Dmytro Milinevskyy
  0 siblings, 1 reply; 22+ messages in thread
From: Sebastian Andrzej Siewior @ 2012-10-24 13:58 UTC (permalink / raw)
  To: Dmytro Milinevskyy
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

On Mon, Oct 08, 2012 at 11:59:03PM +0300, Dmytro Milinevskyy wrote:
> Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
> Tested on MIPS32 big-endian device.
> 
> Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
> ---
>  drivers/usb/gadget/f_ncm.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
> index b651b52..fce45ab 100644
> --- a/drivers/usb/gadget/f_ncm.c
> +++ b/drivers/usb/gadget/f_ncm.c
> @@ -869,11 +869,11 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
>  	struct sk_buff	*skb2;
>  	int		ncb_len = 0;
>  	__le16		*tmp;
> -	int		div = ntb_parameters.wNdpInDivisor;
> -	int		rem = ntb_parameters.wNdpInPayloadRemainder;
> -	int		pad;
> -	int		ndp_align = ntb_parameters.wNdpInAlignment;
> -	int		ndp_pad;
> +	int	div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
> +	int	rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
> +	int	pad;
> +	int	ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
> +	int	ndp_pad;

It would be nice to keep the two tabs between int and variable. One question: 
In ntb_parameters the member wLength is 16bit and not using cpu_to_le16(). How
does it work? Is the test on host side not strict enough?

>  	unsigned	max_size = ncm->port.fixed_in_len;
>  	struct ndp_parser_opts *opts = ncm->parser_opts;
>  	unsigned	crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;

Sebastian

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-10-24 13:58 ` Sebastian Andrzej Siewior
@ 2012-10-28 17:30   ` Dmytro Milinevskyy
  2012-10-28 17:48     ` Sebastian Andrzej Siewior
  0 siblings, 1 reply; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-10-28 17:30 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

Hi Sebastian,
I was trying to keep 2 tabs but checkpatch didn't accept long line
that's why I killed extra tab.

>How does it work? Is the test on host side not strict enough?
The host part(cdc_ncm) does not check this field.
However I agree that at least on device side this should be corrected.

Felipe, do you want me to send another patch or resend previous one
with this correction?

Thanks,
-- dmytro

On Wed, Oct 24, 2012 at 3:58 PM, Sebastian Andrzej Siewior
<sebastian@breakpoint.cc> wrote:
> On Mon, Oct 08, 2012 at 11:59:03PM +0300, Dmytro Milinevskyy wrote:
>> Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
>> Tested on MIPS32 big-endian device.
>>
>> Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
>> ---
>>  drivers/usb/gadget/f_ncm.c | 10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
>> index b651b52..fce45ab 100644
>> --- a/drivers/usb/gadget/f_ncm.c
>> +++ b/drivers/usb/gadget/f_ncm.c
>> @@ -869,11 +869,11 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
>>       struct sk_buff  *skb2;
>>       int             ncb_len = 0;
>>       __le16          *tmp;
>> -     int             div = ntb_parameters.wNdpInDivisor;
>> -     int             rem = ntb_parameters.wNdpInPayloadRemainder;
>> -     int             pad;
>> -     int             ndp_align = ntb_parameters.wNdpInAlignment;
>> -     int             ndp_pad;
>> +     int     div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
>> +     int     rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
>> +     int     pad;
>> +     int     ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
>> +     int     ndp_pad;
>
> It would be nice to keep the two tabs between int and variable. One question:
> In ntb_parameters the member wLength is 16bit and not using cpu_to_le16(). How
> does it work? Is the test on host side not strict enough?
>
>>       unsigned        max_size = ncm->port.fixed_in_len;
>>       struct ndp_parser_opts *opts = ncm->parser_opts;
>>       unsigned        crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
>
> Sebastian

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-10-28 17:30   ` Dmytro Milinevskyy
@ 2012-10-28 17:48     ` Sebastian Andrzej Siewior
  2012-10-31 13:33       ` Felipe Balbi
  0 siblings, 1 reply; 22+ messages in thread
From: Sebastian Andrzej Siewior @ 2012-10-28 17:48 UTC (permalink / raw)
  To: Dmytro Milinevskyy
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

On Sun, Oct 28, 2012 at 06:30:02PM +0100, Dmytro Milinevskyy wrote:
> I was trying to keep 2 tabs but checkpatch didn't accept long line
> that's why I killed extra tab.

Then move them to the code section instead to initialize them in the
declaration section.

> >How does it work? Is the test on host side not strict enough?
> The host part(cdc_ncm) does not check this field.
> However I agree that at least on device side this should be corrected.
Good.

> Felipe, do you want me to send another patch or resend previous one
> with this correction?
If it hasn't been applied yet resend it.

> Thanks,

Sebastian

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-10-28 17:48     ` Sebastian Andrzej Siewior
@ 2012-10-31 13:33       ` Felipe Balbi
  0 siblings, 0 replies; 22+ messages in thread
From: Felipe Balbi @ 2012-10-31 13:33 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior
  Cc: Dmytro Milinevskyy, Felipe Balbi, Greg Kroah-Hartman, linux-usb,
	linux-kernel

[-- Attachment #1: Type: text/plain, Size: 802 bytes --]

On Sun, Oct 28, 2012 at 06:48:29PM +0100, Sebastian Andrzej Siewior wrote:
> On Sun, Oct 28, 2012 at 06:30:02PM +0100, Dmytro Milinevskyy wrote:
> > I was trying to keep 2 tabs but checkpatch didn't accept long line
> > that's why I killed extra tab.
> 
> Then move them to the code section instead to initialize them in the
> declaration section.
> 
> > >How does it work? Is the test on host side not strict enough?
> > The host part(cdc_ncm) does not check this field.
> > However I agree that at least on device side this should be corrected.
> Good.
> 
> > Felipe, do you want me to send another patch or resend previous one
> > with this correction?
> If it hasn't been applied yet resend it.

I think I hasn't applied this one yet, so resending is the way to go.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-09 11:53               ` Felipe Balbi
@ 2012-11-10 18:29                 ` Dmytro Milinevskyy
  0 siblings, 0 replies; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-11-10 18:29 UTC (permalink / raw)
  To: balbi; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel

Hi,

On Fri, Nov 9, 2012 at 12:53 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Fri, Nov 09, 2012 at 10:31:47AM +0100, Dmytro Milinevskyy wrote:
>> Hi Felipe,
>>
>> On Thu, Nov 8, 2012 at 8:30 PM, Felipe Balbi <balbi@ti.com> wrote:
>> > Hi,
>> >
>> > On Thu, Nov 08, 2012 at 08:07:57PM +0100, Dmytro Milinevskyy wrote:
>> >> > On Wed, Nov 07, 2012 at 02:14:00PM +0100, Dmytro Milinevskyy wrote:
>> >> >> Unfortunately I have some issues with git send-email.
>> >> >> I've attached the patch itself ..
>> >> >
>> >> > I'll apply it like that this time, but try to figure out how to send
>> >> > patches properly. We have some very helpful hints on
>> >> > Documentation/email-clients.txt which are hugely underused ;-)
>> >> >
>> >> well, I try to follow the rules as much as possible as long as tools
>> >> work ... =)
>> >
>> > git send-email has thousands of users and it works fine for them
>> > (including myself). Maybe you just misconfigured it ?!? ;-)
>> >
>> No, I was using it in the past w/o any issue.
>> In fact initial versions of the patch were sent exactly with git-send-email.
>>
>> However I lost my internet connection at home(some issues with ISP)
>> and at work place network environment somehow blocks
>> git-send-email(though thunderbird still can connect to the smtp server
>> ..).
>
> I don't think smtp server can make that distinction. Except for the
> message-id, there's nothing there which would help smtp server to figure
> out you're using git send-email. On top of that, it would be just extra
> work to maintain rules to block a tool which is essentially just sending
> an email.
>
> Make sure you're not missing some authentication with the mail server on
> your git send-email configuration.
>
> my 2 cents.

Thanks a lot, I very appreciate your help.
I even tried to use same laptop with same version of git I used to
send the patch for the first time but it didn't help.
Likely there's a network configuration that is blocking
git-send-email. I will try to figure it out with our system
administrators.

cheers,
-- dmytro

> --
> balbi

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-09  9:31             ` Dmytro Milinevskyy
@ 2012-11-09 11:53               ` Felipe Balbi
  2012-11-10 18:29                 ` Dmytro Milinevskyy
  0 siblings, 1 reply; 22+ messages in thread
From: Felipe Balbi @ 2012-11-09 11:53 UTC (permalink / raw)
  To: Dmytro Milinevskyy; +Cc: balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1682 bytes --]

Hi,

On Fri, Nov 09, 2012 at 10:31:47AM +0100, Dmytro Milinevskyy wrote:
> Hi Felipe,
> 
> On Thu, Nov 8, 2012 at 8:30 PM, Felipe Balbi <balbi@ti.com> wrote:
> > Hi,
> >
> > On Thu, Nov 08, 2012 at 08:07:57PM +0100, Dmytro Milinevskyy wrote:
> >> > On Wed, Nov 07, 2012 at 02:14:00PM +0100, Dmytro Milinevskyy wrote:
> >> >> Unfortunately I have some issues with git send-email.
> >> >> I've attached the patch itself ..
> >> >
> >> > I'll apply it like that this time, but try to figure out how to send
> >> > patches properly. We have some very helpful hints on
> >> > Documentation/email-clients.txt which are hugely underused ;-)
> >> >
> >> well, I try to follow the rules as much as possible as long as tools
> >> work ... =)
> >
> > git send-email has thousands of users and it works fine for them
> > (including myself). Maybe you just misconfigured it ?!? ;-)
> >
> No, I was using it in the past w/o any issue.
> In fact initial versions of the patch were sent exactly with git-send-email.
> 
> However I lost my internet connection at home(some issues with ISP)
> and at work place network environment somehow blocks
> git-send-email(though thunderbird still can connect to the smtp server
> ..).

I don't think smtp server can make that distinction. Except for the
message-id, there's nothing there which would help smtp server to figure
out you're using git send-email. On top of that, it would be just extra
work to maintain rules to block a tool which is essentially just sending
an email.

Make sure you're not missing some authentication with the mail server on
your git send-email configuration.

my 2 cents.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-08 19:30           ` Felipe Balbi
@ 2012-11-09  9:31             ` Dmytro Milinevskyy
  2012-11-09 11:53               ` Felipe Balbi
  0 siblings, 1 reply; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-11-09  9:31 UTC (permalink / raw)
  To: balbi; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel

Hi Felipe,

On Thu, Nov 8, 2012 at 8:30 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Thu, Nov 08, 2012 at 08:07:57PM +0100, Dmytro Milinevskyy wrote:
>> > On Wed, Nov 07, 2012 at 02:14:00PM +0100, Dmytro Milinevskyy wrote:
>> >> Unfortunately I have some issues with git send-email.
>> >> I've attached the patch itself ..
>> >
>> > I'll apply it like that this time, but try to figure out how to send
>> > patches properly. We have some very helpful hints on
>> > Documentation/email-clients.txt which are hugely underused ;-)
>> >
>> well, I try to follow the rules as much as possible as long as tools
>> work ... =)
>
> git send-email has thousands of users and it works fine for them
> (including myself). Maybe you just misconfigured it ?!? ;-)
>
No, I was using it in the past w/o any issue.
In fact initial versions of the patch were sent exactly with git-send-email.

However I lost my internet connection at home(some issues with ISP)
and at work place network environment somehow blocks
git-send-email(though thunderbird still can connect to the smtp server
..).

thanks,
-- dmytro

> cheers
>
> --
> balbi

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-08 19:07         ` Dmytro Milinevskyy
@ 2012-11-08 19:30           ` Felipe Balbi
  2012-11-09  9:31             ` Dmytro Milinevskyy
  0 siblings, 1 reply; 22+ messages in thread
From: Felipe Balbi @ 2012-11-08 19:30 UTC (permalink / raw)
  To: Dmytro Milinevskyy; +Cc: balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 699 bytes --]

Hi,

On Thu, Nov 08, 2012 at 08:07:57PM +0100, Dmytro Milinevskyy wrote:
> > On Wed, Nov 07, 2012 at 02:14:00PM +0100, Dmytro Milinevskyy wrote:
> >> Unfortunately I have some issues with git send-email.
> >> I've attached the patch itself ..
> >
> > I'll apply it like that this time, but try to figure out how to send
> > patches properly. We have some very helpful hints on
> > Documentation/email-clients.txt which are hugely underused ;-)
> >
> well, I try to follow the rules as much as possible as long as tools
> work ... =)

git send-email has thousands of users and it works fine for them
(including myself). Maybe you just misconfigured it ?!? ;-)

cheers

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-08 14:06       ` Felipe Balbi
@ 2012-11-08 19:07         ` Dmytro Milinevskyy
  2012-11-08 19:30           ` Felipe Balbi
  0 siblings, 1 reply; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-11-08 19:07 UTC (permalink / raw)
  To: balbi; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel

On Thu, Nov 8, 2012 at 3:06 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> (please, never top-post)
>
got it!

> On Wed, Nov 07, 2012 at 02:14:00PM +0100, Dmytro Milinevskyy wrote:
>> Unfortunately I have some issues with git send-email.
>> I've attached the patch itself ..
>
> I'll apply it like that this time, but try to figure out how to send
> patches properly. We have some very helpful hints on
> Documentation/email-clients.txt which are hugely underused ;-)
>
well, I try to follow the rules as much as possible as long as tools work ... =)

regards,
-- dmytro

> --
> balbi

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-07 13:14     ` Dmytro Milinevskyy
@ 2012-11-08 14:06       ` Felipe Balbi
  2012-11-08 19:07         ` Dmytro Milinevskyy
  0 siblings, 1 reply; 22+ messages in thread
From: Felipe Balbi @ 2012-11-08 14:06 UTC (permalink / raw)
  To: Dmytro Milinevskyy; +Cc: balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 402 bytes --]

Hi,

(please, never top-post)

On Wed, Nov 07, 2012 at 02:14:00PM +0100, Dmytro Milinevskyy wrote:
> Unfortunately I have some issues with git send-email.
> I've attached the patch itself ..

I'll apply it like that this time, but try to figure out how to send
patches properly. We have some very helpful hints on
Documentation/email-clients.txt which are hugely underused ;-)

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-06 11:27   ` Felipe Balbi
@ 2012-11-07 13:14     ` Dmytro Milinevskyy
  2012-11-08 14:06       ` Felipe Balbi
  0 siblings, 1 reply; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-11-07 13:14 UTC (permalink / raw)
  To: balbi; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 2556 bytes --]

Unfortunately I have some issues with git send-email.
I've attached the patch itself ..

regards,
-- dmytro

On Tue, Nov 6, 2012 at 12:27 PM, Felipe Balbi <balbi@ti.com> wrote:
> On Sun, Nov 04, 2012 at 03:30:21PM +0100, Dmytro Milinevskyy wrote:
>> Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
>> Tested on MIPS32 big-endian device.
>>
>> Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
>
> doesn't apply:
>
> $ patch -p1 --dry-run < patch.diff
> patching file drivers/usb/gadget/f_ncm.c
> patch: **** malformed patch at line 31: @@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
>
> can you use git-send-email ?
>
>> ---
>>  drivers/usb/gadget/f_ncm.c | 12 ++++++++----
>>  1 file changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
>> index b651b52..a7cdd47 100644
>> --- a/drivers/usb/gadget/f_ncm.c
>> +++ b/drivers/usb/gadget/f_ncm.c
>> @@ -102,7 +102,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
>>                                USB_CDC_NCM_NTB32_SUPPORTED)
>>  static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
>> -     .wLength = sizeof ntb_parameters,
>> +     .wLength = cpu_to_le16(sizeof(ntb_parameters)),
>>       .bmNtbFormatsSupported = cpu_to_le16(FORMATS_SUPPORTED),
>>       .dwNtbInMaxSize = cpu_to_le32(NTB_DEFAULT_IN_SIZE),
>>       .wNdpInDivisor = cpu_to_le16(4),
>> @@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
>>       struct sk_buff  *skb2;
>>       int             ncb_len = 0;
>>       __le16          *tmp;
>> -     int             div = ntb_parameters.wNdpInDivisor;
>> -     int             rem = ntb_parameters.wNdpInPayloadRemainder;
>> +     int             div;
>> +     int             rem;
>>       int             pad;
>> -     int             ndp_align = ntb_parameters.wNdpInAlignment;
>> +     int             ndp_align;
>>       int             ndp_pad;
>>       unsigned        max_size = ncm->port.fixed_in_len;
>>       struct ndp_parser_opts *opts = ncm->parser_opts;
>>       unsigned        crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
>> +     div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
>> +     rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
>> +     ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
>> +
>>       ncb_len += opts->nth_size;
>>       ndp_pad = ALIGN(ncb_len, ndp_align) - ncb_len;
>>       ncb_len += ndp_pad;
>> --
>> 1.8.0
>>
>>
>
> --
> balbi

[-- Attachment #2: 0001-usb-gadget-ncm-correct-endianess-conversion.patch --]
[-- Type: application/octet-stream, Size: 1882 bytes --]

From ac5b5aa01c070e5ca9001905732fa9ea96112787 Mon Sep 17 00:00:00 2001
From: Dmytro Milinevskyy <milinevskyy@gmail.com>
Date: Fri, 5 Oct 2012 01:44:04 +0300
Subject: [PATCH] usb: gadget: ncm: correct endianess conversion

Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
Tested on MIPS32 big-endian device.

Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
---
 drivers/usb/gadget/f_ncm.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index b651b52..a7cdd47 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -102,7 +102,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
 				 USB_CDC_NCM_NTB32_SUPPORTED)
 
 static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
-	.wLength = sizeof ntb_parameters,
+	.wLength = cpu_to_le16(sizeof(ntb_parameters)),
 	.bmNtbFormatsSupported = cpu_to_le16(FORMATS_SUPPORTED),
 	.dwNtbInMaxSize = cpu_to_le32(NTB_DEFAULT_IN_SIZE),
 	.wNdpInDivisor = cpu_to_le16(4),
@@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
 	struct sk_buff	*skb2;
 	int		ncb_len = 0;
 	__le16		*tmp;
-	int		div = ntb_parameters.wNdpInDivisor;
-	int		rem = ntb_parameters.wNdpInPayloadRemainder;
+	int		div;
+	int		rem;
 	int		pad;
-	int		ndp_align = ntb_parameters.wNdpInAlignment;
+	int		ndp_align;
 	int		ndp_pad;
 	unsigned	max_size = ncm->port.fixed_in_len;
 	struct ndp_parser_opts *opts = ncm->parser_opts;
 	unsigned	crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
 
+	div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
+	rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
+	ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
+
 	ncb_len += opts->nth_size;
 	ndp_pad = ALIGN(ncb_len, ndp_align) - ncb_len;
 	ncb_len += ndp_pad;
-- 
1.8.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-04 14:30 ` Dmytro Milinevskyy
@ 2012-11-06 11:27   ` Felipe Balbi
  2012-11-07 13:14     ` Dmytro Milinevskyy
  0 siblings, 1 reply; 22+ messages in thread
From: Felipe Balbi @ 2012-11-06 11:27 UTC (permalink / raw)
  To: Dmytro Milinevskyy
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 2130 bytes --]

On Sun, Nov 04, 2012 at 03:30:21PM +0100, Dmytro Milinevskyy wrote:
> Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
> Tested on MIPS32 big-endian device.
> 
> Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>

doesn't apply:

$ patch -p1 --dry-run < patch.diff
patching file drivers/usb/gadget/f_ncm.c
patch: **** malformed patch at line 31: @@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,

can you use git-send-email ?

> ---
>  drivers/usb/gadget/f_ncm.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
> index b651b52..a7cdd47 100644
> --- a/drivers/usb/gadget/f_ncm.c
> +++ b/drivers/usb/gadget/f_ncm.c
> @@ -102,7 +102,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
>  				 USB_CDC_NCM_NTB32_SUPPORTED)
>  static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
> -	.wLength = sizeof ntb_parameters,
> +	.wLength = cpu_to_le16(sizeof(ntb_parameters)),
>  	.bmNtbFormatsSupported = cpu_to_le16(FORMATS_SUPPORTED),
>  	.dwNtbInMaxSize = cpu_to_le32(NTB_DEFAULT_IN_SIZE),
>  	.wNdpInDivisor = cpu_to_le16(4),
> @@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
>  	struct sk_buff	*skb2;
>  	int		ncb_len = 0;
>  	__le16		*tmp;
> -	int		div = ntb_parameters.wNdpInDivisor;
> -	int		rem = ntb_parameters.wNdpInPayloadRemainder;
> +	int		div;
> +	int		rem;
>  	int		pad;
> -	int		ndp_align = ntb_parameters.wNdpInAlignment;
> +	int		ndp_align;
>  	int		ndp_pad;
>  	unsigned	max_size = ncm->port.fixed_in_len;
>  	struct ndp_parser_opts *opts = ncm->parser_opts;
>  	unsigned	crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
> +	div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
> +	rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
> +	ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
> +
>  	ncb_len += opts->nth_size;
>  	ndp_pad = ALIGN(ncb_len, ndp_align) - ncb_len;
>  	ncb_len += ndp_pad;
> -- 
> 1.8.0
> 
> 

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread
* [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-01 15:16 Dmytro Milinevskyy
  2012-11-02 11:46 ` Sergei Shtylyov
@ 2012-11-04 14:30 ` Dmytro Milinevskyy
  2012-11-06 11:27   ` Felipe Balbi
  1 sibling, 1 reply; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-11-04 14:30 UTC (permalink / raw)
  To: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
Tested on MIPS32 big-endian device.

Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
---
  drivers/usb/gadget/f_ncm.c | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index b651b52..a7cdd47 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -102,7 +102,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
  				 USB_CDC_NCM_NTB32_SUPPORTED)
  
  static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
-	.wLength = sizeof ntb_parameters,
+	.wLength = cpu_to_le16(sizeof(ntb_parameters)),
  	.bmNtbFormatsSupported = cpu_to_le16(FORMATS_SUPPORTED),
  	.dwNtbInMaxSize = cpu_to_le32(NTB_DEFAULT_IN_SIZE),
  	.wNdpInDivisor = cpu_to_le16(4),
@@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
  	struct sk_buff	*skb2;
  	int		ncb_len = 0;
  	__le16		*tmp;
-	int		div = ntb_parameters.wNdpInDivisor;
-	int		rem = ntb_parameters.wNdpInPayloadRemainder;
+	int		div;
+	int		rem;
  	int		pad;
-	int		ndp_align = ntb_parameters.wNdpInAlignment;
+	int		ndp_align;
  	int		ndp_pad;
  	unsigned	max_size = ncm->port.fixed_in_len;
  	struct ndp_parser_opts *opts = ncm->parser_opts;
  	unsigned	crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
  
+	div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
+	rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
+	ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
+
  	ncb_len += opts->nth_size;
  	ndp_pad = ALIGN(ncb_len, ndp_align) - ncb_len;
  	ncb_len += ndp_pad;
-- 
1.8.0



^ permalink raw reply related	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-02 11:46 ` Sergei Shtylyov
@ 2012-11-04 14:30   ` Dmytro Milinevskyy
  0 siblings, 0 replies; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-11-04 14:30 UTC (permalink / raw)
  To: Sergei Shtylyov; +Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

Hum, you are right. It's pain to send anything via thunderbird.
Resending.

br,
-- dmytro

On Fri, Nov 2, 2012 at 12:46 PM, Sergei Shtylyov <sshtylyov@mvista.com> wrote:
> Hello.
>
>
> On 01-11-2012 19:16, Dmytro Milinevskyy wrote:
>
>> Convert USB descriptor's fields to CPU byte order before using locally in
>> USB
>> NCM gadget driver.
>> Tested on MIPS32 big-endian device.
>
>
>> Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
>> ---
>>   drivers/usb/gadget/f_ncm.c | 12 ++++++++----
>>
>>   1 file changed, 8 insertions(+), 4 deletions(-)
>
>
>> diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
>> index b651b52..a7cdd47 100644
>> --- a/drivers/usb/gadget/f_ncm.c
>> +++ b/drivers/usb/gadget/f_ncm.c
>
> [...]
>>
>> @@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether
>> *port,
>>
>>       struct sk_buff    *skb2;
>>       int        ncb_len = 0;
>>       __le16        *tmp;
>> -    int        div = ntb_parameters.wNdpInDivisor;
>> -    int        rem = ntb_parameters.wNdpInPayloadRemainder;
>> +    int        div;
>> +    int        rem;
>>
>>       int        pad;
>> -    int        ndp_align = ntb_parameters.wNdpInAlignment;
>> +    int        ndp_align;
>>       int        ndp_pad;
>>
>>       unsigned    max_size = ncm->port.fixed_in_len;
>>       struct ndp_parser_opts *opts = ncm->parser_opts;
>>       unsigned    crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
>>   +    div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
>
>
>     Probably corrupt patch -- there shouldn't be spaces before '+'.
>
> WBR, Sergei
>

^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-11-01 15:16 Dmytro Milinevskyy
@ 2012-11-02 11:46 ` Sergei Shtylyov
  2012-11-04 14:30   ` Dmytro Milinevskyy
  2012-11-04 14:30 ` Dmytro Milinevskyy
  1 sibling, 1 reply; 22+ messages in thread
From: Sergei Shtylyov @ 2012-11-02 11:46 UTC (permalink / raw)
  To: Dmytro Milinevskyy
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

Hello.

On 01-11-2012 19:16, Dmytro Milinevskyy wrote:

> Convert USB descriptor's fields to CPU byte order before using locally in USB
> NCM gadget driver.
> Tested on MIPS32 big-endian device.

> Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
> ---
>   drivers/usb/gadget/f_ncm.c | 12 ++++++++----
>   1 file changed, 8 insertions(+), 4 deletions(-)

> diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
> index b651b52..a7cdd47 100644
> --- a/drivers/usb/gadget/f_ncm.c
> +++ b/drivers/usb/gadget/f_ncm.c
[...]
> @@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
>       struct sk_buff    *skb2;
>       int        ncb_len = 0;
>       __le16        *tmp;
> -    int        div = ntb_parameters.wNdpInDivisor;
> -    int        rem = ntb_parameters.wNdpInPayloadRemainder;
> +    int        div;
> +    int        rem;
>       int        pad;
> -    int        ndp_align = ntb_parameters.wNdpInAlignment;
> +    int        ndp_align;
>       int        ndp_pad;
>       unsigned    max_size = ncm->port.fixed_in_len;
>       struct ndp_parser_opts *opts = ncm->parser_opts;
>       unsigned    crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
>   +    div = le16_to_cpu(ntb_parameters.wNdpInDivisor);

     Probably corrupt patch -- there shouldn't be spaces before '+'.

WBR, Sergei


^ permalink raw reply	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-10-31 13:35 ` Felipe Balbi
@ 2012-11-01 15:26   ` Dmytro Milinevskyy
  0 siblings, 0 replies; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-11-01 15:26 UTC (permalink / raw)
  To: balbi; +Cc: Greg Kroah-Hartman, linux-usb, linux-kernel

Hi Felipe,
resent with requested formatting changes.

cheers,
-- dmytro

On Wed, Oct 31, 2012 at 2:35 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Tue, Oct 30, 2012 at 10:44:27AM +0100, Dmytro Milinevskyy wrote:
>> Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
>> Tested on MIPS32 big-endian device.
>>
>> Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
>> ---
>>  drivers/usb/gadget/f_ncm.c | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
>> index b651b52..0b9e2ad 100644
>> --- a/drivers/usb/gadget/f_ncm.c
>> +++ b/drivers/usb/gadget/f_ncm.c
>> @@ -102,7 +102,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
>>                                USB_CDC_NCM_NTB32_SUPPORTED)
>>  static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
>> -     .wLength = sizeof ntb_parameters,
>> +     .wLength = cpu_to_le16(sizeof(ntb_parameters)),
>>       .bmNtbFormatsSupported = cpu_to_le16(FORMATS_SUPPORTED),
>>       .dwNtbInMaxSize = cpu_to_le32(NTB_DEFAULT_IN_SIZE),
>>       .wNdpInDivisor = cpu_to_le16(4),
>> @@ -869,15 +869,15 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
>>       struct sk_buff  *skb2;
>>       int             ncb_len = 0;
>>       __le16          *tmp;
>> -     int             div = ntb_parameters.wNdpInDivisor;
>> -     int             rem = ntb_parameters.wNdpInPayloadRemainder;
>> -     int             pad;
>> -     int             ndp_align = ntb_parameters.wNdpInAlignment;
>> -     int             ndp_pad;
>> +     int             div, rem, pad, ndp_align, ndp_pad;
>
> I would not combine them in a single line. Keep them one per line.
>
> cheers
>
> --
> balbi

^ permalink raw reply	[flat|nested] 22+ messages in thread
* [PATCH] usb: gadget: ncm: correct endianess conversion
@ 2012-11-01 15:16 Dmytro Milinevskyy
  2012-11-02 11:46 ` Sergei Shtylyov
  2012-11-04 14:30 ` Dmytro Milinevskyy
  0 siblings, 2 replies; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-11-01 15:16 UTC (permalink / raw)
  To: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

Convert USB descriptor's fields to CPU byte order before using locally 
in USB NCM gadget driver.
Tested on MIPS32 big-endian device.

Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
---
  drivers/usb/gadget/f_ncm.c | 12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index b651b52..a7cdd47 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -102,7 +102,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
  				 USB_CDC_NCM_NTB32_SUPPORTED)
   static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
-	.wLength = sizeof ntb_parameters,
+	.wLength = cpu_to_le16(sizeof(ntb_parameters)),
  	.bmNtbFormatsSupported = cpu_to_le16(FORMATS_SUPPORTED),
  	.dwNtbInMaxSize = cpu_to_le32(NTB_DEFAULT_IN_SIZE),
  	.wNdpInDivisor = cpu_to_le16(4),
@@ -869,15 +869,19 @@ static struct sk_buff *ncm_wrap_ntb(struct gether 
*port,
  	struct sk_buff	*skb2;
  	int		ncb_len = 0;
  	__le16		*tmp;
-	int		div = ntb_parameters.wNdpInDivisor;
-	int		rem = ntb_parameters.wNdpInPayloadRemainder;
+	int		div;
+	int		rem;
  	int		pad;
-	int		ndp_align = ntb_parameters.wNdpInAlignment;
+	int		ndp_align;
  	int		ndp_pad;
  	unsigned	max_size = ncm->port.fixed_in_len;
  	struct ndp_parser_opts *opts = ncm->parser_opts;
  	unsigned	crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
  +	div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
+	rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
+	ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
+
  	ncb_len += opts->nth_size;
  	ndp_pad = ALIGN(ncb_len, ndp_align) - ncb_len;
  	ncb_len += ndp_pad;
-- 
1.8.0



^ permalink raw reply related	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-10-30  9:44 Dmytro Milinevskyy
@ 2012-10-31 13:35 ` Felipe Balbi
  2012-11-01 15:26   ` Dmytro Milinevskyy
  0 siblings, 1 reply; 22+ messages in thread
From: Felipe Balbi @ 2012-10-31 13:35 UTC (permalink / raw)
  To: Dmytro Milinevskyy
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]

Hi,

On Tue, Oct 30, 2012 at 10:44:27AM +0100, Dmytro Milinevskyy wrote:
> Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
> Tested on MIPS32 big-endian device.
> 
> Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
> ---
>  drivers/usb/gadget/f_ncm.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
> index b651b52..0b9e2ad 100644
> --- a/drivers/usb/gadget/f_ncm.c
> +++ b/drivers/usb/gadget/f_ncm.c
> @@ -102,7 +102,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
>  				 USB_CDC_NCM_NTB32_SUPPORTED)
>  static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
> -	.wLength = sizeof ntb_parameters,
> +	.wLength = cpu_to_le16(sizeof(ntb_parameters)),
>  	.bmNtbFormatsSupported = cpu_to_le16(FORMATS_SUPPORTED),
>  	.dwNtbInMaxSize = cpu_to_le32(NTB_DEFAULT_IN_SIZE),
>  	.wNdpInDivisor = cpu_to_le16(4),
> @@ -869,15 +869,15 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
>  	struct sk_buff	*skb2;
>  	int		ncb_len = 0;
>  	__le16		*tmp;
> -	int		div = ntb_parameters.wNdpInDivisor;
> -	int		rem = ntb_parameters.wNdpInPayloadRemainder;
> -	int		pad;
> -	int		ndp_align = ntb_parameters.wNdpInAlignment;
> -	int		ndp_pad;
> +	int		div, rem, pad, ndp_align, ndp_pad;

I would not combine them in a single line. Keep them one per line.

cheers

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread
* [PATCH] usb: gadget: ncm: correct endianess conversion
@ 2012-10-30  9:44 Dmytro Milinevskyy
  2012-10-31 13:35 ` Felipe Balbi
  0 siblings, 1 reply; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-10-30  9:44 UTC (permalink / raw)
  To: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

Convert USB descriptor's fields to CPU byte order before using locally in USB NCM gadget driver.
Tested on MIPS32 big-endian device.

Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
---
  drivers/usb/gadget/f_ncm.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index b651b52..0b9e2ad 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -102,7 +102,7 @@ static inline unsigned ncm_bitrate(struct usb_gadget *g)
  				 USB_CDC_NCM_NTB32_SUPPORTED)
  
  static struct usb_cdc_ncm_ntb_parameters ntb_parameters = {
-	.wLength = sizeof ntb_parameters,
+	.wLength = cpu_to_le16(sizeof(ntb_parameters)),
  	.bmNtbFormatsSupported = cpu_to_le16(FORMATS_SUPPORTED),
  	.dwNtbInMaxSize = cpu_to_le32(NTB_DEFAULT_IN_SIZE),
  	.wNdpInDivisor = cpu_to_le16(4),
@@ -869,15 +869,15 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
  	struct sk_buff	*skb2;
  	int		ncb_len = 0;
  	__le16		*tmp;
-	int		div = ntb_parameters.wNdpInDivisor;
-	int		rem = ntb_parameters.wNdpInPayloadRemainder;
-	int		pad;
-	int		ndp_align = ntb_parameters.wNdpInAlignment;
-	int		ndp_pad;
+	int		div, rem, pad, ndp_align, ndp_pad;
  	unsigned	max_size = ncm->port.fixed_in_len;
  	struct ndp_parser_opts *opts = ncm->parser_opts;
  	unsigned	crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
  
+	div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
+	rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
+	ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
+
  	ncb_len += opts->nth_size;
  	ndp_pad = ALIGN(ncb_len, ndp_align) - ncb_len;
  	ncb_len += ndp_pad;
-- 
1.8.0



^ permalink raw reply related	[flat|nested] 22+ messages in thread
* Re: [PATCH] usb: gadget: ncm: correct endianess conversion
  2012-10-04 22:58 Dmytro Milinevskyy
@ 2012-10-08  6:53 ` Felipe Balbi
  0 siblings, 0 replies; 22+ messages in thread
From: Felipe Balbi @ 2012-10-08  6:53 UTC (permalink / raw)
  To: Dmytro Milinevskyy
  Cc: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

On Fri, Oct 05, 2012 at 01:58:21AM +0300, Dmytro Milinevskyy wrote:
> 
> Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>

missing commit log. NAK. Just resend with a proper commit log and I can
apply.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread
* [PATCH] usb: gadget: ncm: correct endianess conversion
@ 2012-10-04 22:58 Dmytro Milinevskyy
  2012-10-08  6:53 ` Felipe Balbi
  0 siblings, 1 reply; 22+ messages in thread
From: Dmytro Milinevskyy @ 2012-10-04 22:58 UTC (permalink / raw)
  To: Felipe Balbi, Greg Kroah-Hartman, linux-usb, linux-kernel
  Cc: Dmytro Milinevskyy


Signed-off-by: Dmytro Milinevskyy <milinevskyy@gmail.com>
---
 drivers/usb/gadget/f_ncm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index b651b52..fce45ab 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -869,11 +869,11 @@ static struct sk_buff *ncm_wrap_ntb(struct gether *port,
 	struct sk_buff	*skb2;
 	int		ncb_len = 0;
 	__le16		*tmp;
-	int		div = ntb_parameters.wNdpInDivisor;
-	int		rem = ntb_parameters.wNdpInPayloadRemainder;
-	int		pad;
-	int		ndp_align = ntb_parameters.wNdpInAlignment;
-	int		ndp_pad;
+	int	div = le16_to_cpu(ntb_parameters.wNdpInDivisor);
+	int	rem = le16_to_cpu(ntb_parameters.wNdpInPayloadRemainder);
+	int	pad;
+	int	ndp_align = le16_to_cpu(ntb_parameters.wNdpInAlignment);
+	int	ndp_pad;
 	unsigned	max_size = ncm->port.fixed_in_len;
 	struct ndp_parser_opts *opts = ncm->parser_opts;
 	unsigned	crc_len = ncm->is_crc ? sizeof(uint32_t) : 0;
-- 
1.7.12


^ permalink raw reply related	[flat|nested] 22+ messages in thread
end of thread, other threads:[~2012-11-10 18:30 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-08 20:59 [PATCH] usb: gadget: ncm: correct endianess conversion Dmytro Milinevskyy
2012-10-24 13:58 ` Sebastian Andrzej Siewior
2012-10-28 17:30   ` Dmytro Milinevskyy
2012-10-28 17:48     ` Sebastian Andrzej Siewior
2012-10-31 13:33       ` Felipe Balbi
  -- strict thread matches above, loose matches on Subject: below --
2012-11-01 15:16 Dmytro Milinevskyy
2012-11-02 11:46 ` Sergei Shtylyov
2012-11-04 14:30   ` Dmytro Milinevskyy
2012-11-04 14:30 ` Dmytro Milinevskyy
2012-11-06 11:27   ` Felipe Balbi
2012-11-07 13:14     ` Dmytro Milinevskyy
2012-11-08 14:06       ` Felipe Balbi
2012-11-08 19:07         ` Dmytro Milinevskyy
2012-11-08 19:30           ` Felipe Balbi
2012-11-09  9:31             ` Dmytro Milinevskyy
2012-11-09 11:53               ` Felipe Balbi
2012-11-10 18:29                 ` Dmytro Milinevskyy
2012-10-30  9:44 Dmytro Milinevskyy
2012-10-31 13:35 ` Felipe Balbi
2012-11-01 15:26   ` Dmytro Milinevskyy
2012-10-04 22:58 Dmytro Milinevskyy
2012-10-08  6:53 ` Felipe Balbi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).