Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 6 Nov 2009 08:55:55 +0000 (00:55 -0800)]
Conflicts:
drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

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

26 files changed:
1  2 
MAINTAINERS
drivers/net/benet/be_cmds.h
drivers/net/davinci_emac.c
drivers/net/e100.c
drivers/net/e1000e/e1000.h
drivers/net/r8169.c
drivers/net/sky2.c
drivers/net/usb/cdc_ether.c
drivers/net/virtio_net.c
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/libertas/if_usb.c
firmware/Makefile
firmware/WHENCE
include/linux/skbuff.h
include/net/ip_fib.h
net/bridge/br_if.c
net/core/datagram.c
net/ipv4/fib_frontend.c
net/ipv4/ip_gre.c
net/ipv4/route.c
net/ipv4/udp.c
net/ipv6/udp.c
net/rose/rose_route.c
net/sunrpc/svcsock.c
net/wireless/sme.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -550,22 -542,62 +550,62 @@@ static const struct usb_device_id       produ
        /* Ericsson F3607gw */
        USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1904, USB_CLASS_COMM,
                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
 +      .driver_info = (unsigned long) &mbm_info,
  }, {
-       /* Ericsson F3307 */
+       /* Ericsson F3607gw ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1905, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Ericsson F3607gw ver 3 */
        USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1906, USB_CLASS_COMM,
                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
 +      .driver_info = (unsigned long) &mbm_info,
  }, {
+       /* Ericsson F3307 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190a, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Ericsson F3307 ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1909, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Ericsson C3607w */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1049, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
        /* Toshiba F3507g */
        USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM,
                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
 +      .driver_info = (unsigned long) &mbm_info,
  }, {
+       /* Toshiba F3607gw */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130c, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Toshiba F3607gw ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x1311, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
        /* Dell F3507g */
        USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8147, USB_CLASS_COMM,
                        USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
 +      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Dell F3607gw */
+       USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8183, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
+ }, {
+       /* Dell F3607gw ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8184, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 -      .driver_info = (unsigned long) &cdc_info,
++      .driver_info = (unsigned long) &mbm_info,
  },
        { },            // END
  };
Simple merge
Simple merge
Simple merge
diff --cc firmware/WHENCE
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
diff --cc net/ipv6/udp.c
Simple merge
Simple merge
Simple merge
Simple merge