Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 109751bad3bb..f967913e11bc 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -328,13 +328,13 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         static const char ifname[] = "usbpn%d";
         const struct usb_cdc_union_desc *union_header = NULL;
-        const struct usb_cdc_header_desc *phonet_header = NULL;
         const struct usb_host_interface *data_desc;
         struct usb_interface *data_intf;
         struct usb_device *usbdev = interface_to_usbdev(intf);
         struct net_device *dev;
         struct usbpn_dev *pnd;
         u8 *data;
+        int phonet = 0;
         int len, err;
 
         data = intf->altsetting->extra;
@@ -355,10 +355,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                         (struct usb_cdc_union_desc *)data;
                                 break;
                         case 0xAB:
-                                if (phonet_header || dlen < 5)
-                                        break;
-                                phonet_header =
-                                        (struct usb_cdc_header_desc *)data;
+                                phonet = 1;
                                 break;
                         }
                 }
@@ -366,7 +363,7 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 len -= dlen;
         }
 
-        if (!union_header || !phonet_header)
+        if (!union_header || !phonet)
                 return -EINVAL;
 
         data_intf = usb_ifnum_to_if(usbdev, union_header->bSlaveInterface0);
@@ -392,7 +389,6 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
         pnd = netdev_priv(dev);
         SET_NETDEV_DEV(dev, &intf->dev);
-        netif_stop_queue(dev);
 
         pnd->dev = dev;
         pnd->usb = usb_get_dev(usbdev);