Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net

Pull in 'net' to take in the bug fixes that didn't make it into
3.8-final.

Also, deal with the semantic conflict of the change made to
net/ipv6/xfrm6_policy.c   A missing rt6->n neighbour release
was added to 'net', but in 'net-next' we no longer cache the
neighbour entries in the ipv6 routes so that change is not
appropriate there.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index d7115eca5efe..4a8c25a22294 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -576,9 +576,14 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
         if ((intf->num_altsetting == 2) &&
             !usb_set_interface(dev->udev,
                                intf->cur_altsetting->desc.bInterfaceNumber,
-                               CDC_NCM_COMM_ALTSETTING_MBIM) &&
-            cdc_ncm_comm_intf_is_mbim(intf->cur_altsetting))
-                return -ENODEV;
+                               CDC_NCM_COMM_ALTSETTING_MBIM)) {
+                if (cdc_ncm_comm_intf_is_mbim(intf->cur_altsetting))
+                        return -ENODEV;
+                else
+                        usb_set_interface(dev->udev,
+                                          intf->cur_altsetting->desc.bInterfaceNumber,
+                                          CDC_NCM_COMM_ALTSETTING_NCM);
+        }
 #endif
 
         /* NCM data altsetting is always 1 */