From: Dmytro Milinevskyy <milinevskyy@gmail.com>
To: Felipe Balbi <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] usb: gadget: ncm: correct endianess conversion
Date: Thu, 01 Nov 2012 16:16:03 +0100 [thread overview]
Message-ID: <50929233.7030609@gmail.com> (raw)
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
next reply other threads:[~2012-11-01 15:21 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-01 15:16 Dmytro Milinevskyy [this message]
2012-11-02 11:46 ` [PATCH] usb: gadget: ncm: correct endianess conversion 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
-- strict thread matches above, loose matches on Subject: below --
2012-10-30 9:44 Dmytro Milinevskyy
2012-10-31 13:35 ` Felipe Balbi
2012-11-01 15:26 ` Dmytro Milinevskyy
2012-10-08 20:59 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
2012-10-04 22:58 Dmytro Milinevskyy
2012-10-08 6:53 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50929233.7030609@gmail.com \
--to=milinevskyy@gmail.com \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).