summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQiuping Chen <cqiuping@gmail.com>2009-07-01 03:49:29 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-07-12 15:16:37 -0700
commit6bc2146e2b01654534a1cae127ef96bf4b5f3d53 (patch)
treea0a48e348835eb39af20cb1109064497a49dea8b
parentca157c4a51fa6209f28c316f4a63d594adb79518 (diff)
downloadlinux-3.10-6bc2146e2b01654534a1cae127ef96bf4b5f3d53.tar.gz
linux-3.10-6bc2146e2b01654534a1cae127ef96bf4b5f3d53.tar.bz2
linux-3.10-6bc2146e2b01654534a1cae127ef96bf4b5f3d53.zip
USB: gadget: rndis conformance tweak
Support OID_802_3_MAC_OPTIONS in gen_ndis_query_resp() of rndis.c to make RNDIS gadget pass 1c_SetMulticast subtest in Microsoft NDISTest6: http://www.microsoft.com/whdc/DevTools/tools/NDIStest.mspx The other tests in NDISTest6 are passed. [ dbrownell@users.sourceforge.net: remove OID_802_3_MAXIMUM_LIST_SIZE setting ... it was bogus, this code only handles one entry, not 32. And we don't know what would break if we lied about that... ] Signed-off-by: Helen Chen <helen.chen@intel.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/rndis.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 2b4660e08c4..ca41b0b5afb 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -442,6 +442,8 @@ gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
case OID_802_3_MAC_OPTIONS:
pr_debug("%s: OID_802_3_MAC_OPTIONS\n", __func__);
+ *outbuf = cpu_to_le32(0);
+ retval = 0;
break;
/* ieee802.3 statistics OIDs (table 4-4) */