| Message ID | 1352398152.22225.14.camel@dcbw.foobar.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Dan Williams <dcbw@redhat.com> Date: Thu, 08 Nov 2012 12:09:12 -0600 > Small cleanup. > > Signed-off-by: Dan Williams <dcbw@redhat.com> > Cc: stable@vger.kernel.org Don't do things like this, _please_. A cleanup is absolutely not appropriate for -stable. Yet you tagged this as being destined for there. What's more this screws up the second patch, which in fact could be -stable material. But I'm not going to apply it as it is because it could have dependencies on this patch which as states is not inappropriate for both 'net' and -stable. I'm therefore tossing both of these changes, submit things properly please. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2012-11-09 at 16:07 -0500, David Miller wrote: > From: Dan Williams <dcbw@redhat.com> > Date: Thu, 08 Nov 2012 12:09:12 -0600 > > > Small cleanup. > > > > Signed-off-by: Dan Williams <dcbw@redhat.com> > > Cc: stable@vger.kernel.org > > Don't do things like this, _please_. > > A cleanup is absolutely not appropriate for -stable. Yet you > tagged this as being destined for there. Ok. > What's more this screws up the second patch, which in fact could > be -stable material. But I'm not going to apply it as it is > because it could have dependencies on this patch which as > states is not inappropriate for both 'net' and -stable. I did carefully check that the context for the second patch (qmi_wwan/cdc_ether: add Dell Wireless 5800 (Novatel E362) USB IDs) was *not* dependent on the first patch. Hence I did not post them as a series, but as separate patches, as they should be independently applicable. > I'm therefore tossing both of these changes, submit things properly > please. I will resubmit both patches, with "qmi_wwan/cdc_ether: add Dell Wireless 5800 (Novatel E362) USB IDs" cc-ed to stable@, but this patch (cdc_ether: use USB_DEVICE_AND_INTERFACE_INFO for Novatel 551L/E362) only for net-next. Thanks, Dan -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index d012982..d095b39 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -594,27 +594,15 @@ static const struct usb_device_id products [] = { /* Novatel USB551L and MC551 - handled by qmi_wwan */ { - .match_flags = USB_DEVICE_ID_MATCH_VENDOR - | USB_DEVICE_ID_MATCH_PRODUCT - | USB_DEVICE_ID_MATCH_INT_INFO, - .idVendor = NOVATEL_VENDOR_ID, - .idProduct = 0xB001, - .bInterfaceClass = USB_CLASS_COMM, - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, - .bInterfaceProtocol = USB_CDC_PROTO_NONE, + USB_DEVICE_AND_INTERFACE_INFO(NOVATEL_VENDOR_ID, 0xB001, USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), .driver_info = 0, }, /* Novatel E362 - handled by qmi_wwan */ { - .match_flags = USB_DEVICE_ID_MATCH_VENDOR - | USB_DEVICE_ID_MATCH_PRODUCT - | USB_DEVICE_ID_MATCH_INT_INFO, - .idVendor = NOVATEL_VENDOR_ID, - .idProduct = 0x9010, - .bInterfaceClass = USB_CLASS_COMM, - .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, - .bInterfaceProtocol = USB_CDC_PROTO_NONE, + USB_DEVICE_AND_INTERFACE_INFO(NOVATEL_VENDOR_ID, 0x9010, USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), .driver_info = 0, },
Small cleanup. Signed-off-by: Dan Williams <dcbw@redhat.com> Cc: stable@vger.kernel.org --- drivers/net/usb/cdc_ether.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html