)]}' { "log": [ { "commit": "d946092000698fd204d82a9d239103c656fb63bf", "tree": "6d043e823caaddbbbde50b79429d110169f22b28", "parents": [ "6fdbab9d93e04bfe71f2b3fde485d092e2ffe3ec" ], "author": { "name": "Rabin Vincent", "email": "rabin@rab.in", "time": "Sat Apr 30 08:29:27 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 02 15:50:58 2011 -0700" }, "message": "smsc95xx: fix reset check\n\nThe reset loop check should check the MII_BMCR register value for\nBMCR_RESET rather than for MII_BMCR (the register address, which also\nhappens to be zero).\n\nSigned-off-by: Rabin Vincent \u003crabin@rab.in\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b3c914aa84f4e4bbb3efc8f41c359d96e5e932d2", "tree": "5b500f869ec00167f87a197900c9fddfe14ec362", "parents": [ "8333a46ad3877485e4d67ef499c6dda36bfd1f9a" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Wed Apr 27 09:54:28 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 29 12:40:20 2011 -0700" }, "message": "usbnet: add support for some Huawei modems with cdc-ether ports\n\nSome newer Huawei devices (T-Mobile Rocket, others) have cdc-ether\ncompatible ports, so recognize and expose them.\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nAcked-by: Oliver Neukum \u003coneukum@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68972efa657040f891c7eda07c7da8c8dd576788", "tree": "56e451d2101c37802fa043e41f55b8b5daad6b82", "parents": [ "7833aa05b8db63484b43b4b4c389cd4533140afb" ], "author": { "name": "Paul Stewart", "email": "pstew@chromium.org", "time": "Thu Apr 28 05:43:37 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 28 12:56:09 2011 -0700" }, "message": "usbnet: Resubmit interrupt URB if device is open\n\nResubmit interrupt URB if device is open. Use a flag set in\nusbnet_open() to determine this state. Also kill and free\ninterrupt URB in usbnet_disconnect().\n\n[Rebased off git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git]\n\nSigned-off-by: Paul Stewart \u003cpstew@chromium.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8c61d9d611cb5b290f1b4ac57c4631acfd6e3b5a", "tree": "0e8d3f1c5d9d8bc34d238e739ea57cd098560924", "parents": [ "9ac067a84efbc7f5570d4d93c3b303001d5e8b38" ], "author": { "name": "Hans Petter Selasky", "email": "hselasky@c2i.net", "time": "Sun Apr 24 22:35:19 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 24 22:35:19 2011 -0700" }, "message": "cdc_ncm: fix short packet issue on some devices\n\nThe default maximum transmit length for NCM USB frames should be so\nthat a short packet happens at the end if the device supports a length\ngreater than the defined maximum. This is achieved by adding 4 bytes\nto the maximum length so that the existing logic can fit a short\npacket there.\n\nSigned-off-by: Hans Petter Selasky \u003chselasky@c2i.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c44eaf41a5a423993932c9a9ad279ee132779b48", "tree": "3554fc0bfdcd97936417d6d001d00710d11e67e5", "parents": [ "4263a2f1dad8c8e7ce2352a0cbc882c2b0c044a9", "88edaa415966af965bb7eb7056d8b58145462c8e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 11 07:27:24 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 11 07:27:24 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (34 commits)\n net: Add support for SMSC LAN9530, LAN9730 and LAN89530\n mlx4_en: Restoring RX buffer pointer in case of failure\n mlx4: Sensing link type at device initialization\n ipv4: Fix \"Set rt-\u003ert_iif more sanely on output routes.\"\n MAINTAINERS: add entry for Xen network backend\n be2net: Fix suspend/resume operation\n be2net: Rename some struct members for clarity\n pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev\n dsa/mv88e6131: add support for mv88e6085 switch\n ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2)\n be2net: Fix a potential crash during shutdown.\n bna: Fix for handling firmware heartbeat failure\n can: mcp251x: Allow pass IRQ flags through platform data.\n smsc911x: fix mac_lock acquision before calling smsc911x_mac_read\n iwlwifi: accept EEPROM version 0x423 for iwl6000\n rt2x00: fix cancelling uninitialized work\n rtlwifi: Fix some warnings/bugs\n p54usb: IDs for two new devices\n wl12xx: fix potential buffer overflow in testmode nvs push\n zd1211rw: reset rx idle timer from tasklet\n ...\n" }, { "commit": "88edaa415966af965bb7eb7056d8b58145462c8e", "tree": "6a681868803740cd6317080cf9507eaf4dfb5d49", "parents": [ "60b1809f7e2ea2620aa548e1c866066756bdd1d2" ], "author": { "name": "Steve Glendinning", "email": "steve.glendinning@smsc.com", "time": "Sun Apr 10 18:59:27 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 10 18:59:27 2011 -0700" }, "message": "net: Add support for SMSC LAN9530, LAN9730 and LAN89530\n\nThis patch adds support for SMSC\u0027s LAN9530, LAN9730 and LAN89530 USB\nethernet controllers to the existing smsc95xx driver by adding\ntheir new USB VID/PID pairs.\n\nSigned-off-by: Steve Glendinning \u003csteve.glendinning@smsc.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "c261344d3ce3edac781f9d3c7eabe2e96d8e8fe8", "tree": "a0f71fa65dc9b6536a5e03e7621889d6ecf48f79", "parents": [ "1591cb60838603c8cc2c540192c8244962436539" ], "author": { "name": "Arnd Bergmann", "email": "arnd.bergmann@linaro.org", "time": "Fri Apr 01 20:12:02 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 01 20:12:02 2011 -0700" }, "message": "usbnet: use eth%d name for known ethernet devices\n\nThe documentation for the USB ethernet devices suggests that\nonly some devices are supposed to use usb0 as the network interface\nname instead of eth0. The logic used there, and documented in\nKconfig for CDC is that eth0 will be used when the mac address\nis a globally assigned one, but usb0 is used for the locally\nmanaged range that is typically used on point-to-point links.\n\nUnfortunately, this has caused a lot of pain on the smsc95xx\ndevice that is used on the popular pandaboard without an\nEEPROM to store the MAC address, which causes the driver to\ncall random_ether_address().\n\nObviously, there should be a proper MAC addressed assigned to\nthe device, and discussions are ongoing about how to solve\nthis, but this patch at least makes sure that the default\ninterface naming gets a little saner and matches what the\nuser can expect based on the documentation, including for\nnew devices.\n\nThe approach taken here is to flag whether a device might be a\npoint-to-point link with the new FLAG_POINTTOPOINT setting in\nthe usbnet driver_info. A driver can set both FLAG_POINTTOPOINT\nand FLAG_ETHER if it is not sure (e.g. cdc_ether), or just one\nof the two. The usbnet framework only looks at the MAC address\nfor device naming if both flags are set, otherwise it trusts the\nflag.\n\nSigned-off-by: Arnd Bergmann \u003carnd.bergmann@linaro.org\u003e\nTested-by: Andy Green \u003candy.green@linaro.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "7a635ea989991d7f12d57a12f2ba7cb6d211e083", "tree": "63ae2f1dc375fb239237b90f23af93b8a8245132", "parents": [ "d005a09edf8b12dd1bec651b2cf94caa0e7bb1be" ], "author": { "name": "Andrzej Zaborowski", "email": "andrew.zaborowski@intel.com", "time": "Mon Mar 28 12:56:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 30 02:35:08 2011 -0700" }, "message": "net/usb: Ethernet quirks for the LG-VL600 4G modem\n\nThis adds a driver for the CDC Ethernet part of this modem. The\ndevice\u0027s ID is blacklisted in cdc_ether.c and is white-listed in\nthis new driver because of the quirks needed to make it useful.\nThe modem\u0027s firmware exposes a CDC ACM port for modem control and a\nCDC Ethernet port for network data. The descriptors look fine but\nboth ports actually are some sort of multiplexers requiring non-\nstandard headers added/removed from every packet or they get\nignored. All information is based on a usb traffic log from a\nWindows machine.\n\nOn the Verizon 4G network I\u0027ve seen speeds up to 1.1MB/s so far with\nthis driver, a speed-o-meter site reports 16.2Mbps/10.5Mbps.\nUserspace scripts are required to talk to the CDC ACM port.\n\nSigned-off-by: Andrzej Zaborowski \u003cbalrogg@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c0f3c605b2572c740f66ea39fe2d125399b20aa", "tree": "e74ddb86401d065c1904fc76d1eb5931b80c440c", "parents": [ "27660515a21bf913e3208ded3f27abd0529fae0e" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Fri Mar 18 03:53:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 22 01:02:18 2011 -0700" }, "message": "NET: smsc95xx: don\u0027t use stack for async writes to the device\n\nThe set_multicast operation performs asynchronous writes to the\ndevice, with some addresses pointing to the stack. Bad things may\nhappen, and this is trapped CONFIG_DMA_API_DEBUG:\n\n[ 5.237762] WARNING: at /build/buildd/linux-linaro-omap-2.6.38/lib/dma-debug.c:867 check_for_stack+0xd4/0x100()\n[ 5.237792] ehci-omap ehci-omap.0: DMA-API: device driver maps memory fromstack [addr\u003dd9c77dec]\n[ 5.237792] Modules linked in: smsc95xx(+) usbnet twl6030_usb twl4030_pwrbutton leds_gpio omap_wdt omap2_mcspi\n[ 5.237854] [\u003cc006d618\u003e] (unwind_backtrace+0x0/0xf8) from [\u003cc00a6a14\u003e] (warn_slowpath_common+0x54/0x64)\n[ 5.237884] [\u003cc00a6a14\u003e] (warn_slowpath_common+0x54/0x64) from [\u003cc00a6ab8\u003e] (warn_slowpath_fmt+0x30/0x40)\n[ 5.237915] [\u003cc00a6ab8\u003e] (warn_slowpath_fmt+0x30/0x40) from [\u003cc034e9d8\u003e] (check_for_stack+0xd4/0x100)\n[ 5.237915] [\u003cc034e9d8\u003e] (check_for_stack+0xd4/0x100) from [\u003cc034fea8\u003e] (debug_dma_map_page+0xb4/0xdc)\n[ 5.237976] [\u003cc034fea8\u003e] (debug_dma_map_page+0xb4/0xdc) from [\u003cc04242f0\u003e] (map_urb_for_dma+0x26c/0x304)\n[ 5.237976] [\u003cc04242f0\u003e] (map_urb_for_dma+0x26c/0x304) from [\u003cc0424594\u003e] (usb_hcd_submit_urb+0x78/0x19c)\n[ 5.238037] [\u003cc0424594\u003e] (usb_hcd_submit_urb+0x78/0x19c) from [\u003cbf049c5c\u003e] (smsc95xx_write_reg_async+0xb4/0x130 [smsc95xx])\n[ 5.238067] [\u003cbf049c5c\u003e] (smsc95xx_write_reg_async+0xb4/0x130 [smsc95xx]) from [\u003cbf049dd4\u003e] (smsc95xx_set_multicast+0xfc/0x148 [smsc95xx])\n[ 5.238098] [\u003cbf049dd4\u003e] (smsc95xx_set_multicast+0xfc/0x148 [smsc95xx]) from [\u003cbf04a118\u003e] (smsc95xx_reset+0x2f8/0x68c [smsc95xx])\n[ 5.238128] [\u003cbf04a118\u003e] (smsc95xx_reset+0x2f8/0x68c [smsc95xx]) from [\u003cbf04a8cc\u003e] (smsc95xx_bind+0xcc/0x188 [smsc95xx])\n[ 5.238159] [\u003cbf04a8cc\u003e] (smsc95xx_bind+0xcc/0x188 [smsc95xx]) from [\u003cbf03ef1c\u003e] (usbnet_probe+0x204/0x4c4 [usbnet])\n[ 5.238220] [\u003cbf03ef1c\u003e] (usbnet_probe+0x204/0x4c4 [usbnet]) from [\u003cc0429078\u003e] (usb_probe_interface+0xe4/0x1c4)\n[ 5.238250] [\u003cc0429078\u003e] (usb_probe_interface+0xe4/0x1c4) from [\u003cc03a8770\u003e] (really_probe+0x64/0x160)\n[ 5.238250] [\u003cc03a8770\u003e] (really_probe+0x64/0x160) from [\u003cc03a8a30\u003e] (driver_probe_device+0x48/0x60)\n[ 5.238281] [\u003cc03a8a30\u003e] (driver_probe_device+0x48/0x60) from [\u003cc03a8ad4\u003e] (__driver_attach+0x8c/0x90)\n[ 5.238311] [\u003cc03a8ad4\u003e] (__driver_attach+0x8c/0x90) from [\u003cc03a7b24\u003e] (bus_for_each_dev+0x50/0x7c)\n[ 5.238311] [\u003cc03a7b24\u003e] (bus_for_each_dev+0x50/0x7c) from [\u003cc03a82ec\u003e] (bus_add_driver+0x190/0x250)\n[ 5.238311] [\u003cc03a82ec\u003e] (bus_add_driver+0x190/0x250) from [\u003cc03a8cf8\u003e] (driver_register+0x78/0x13c)\n[ 5.238433] [\u003cc03a8cf8\u003e] (driver_register+0x78/0x13c) from [\u003cc0428040\u003e] (usb_register_driver+0x78/0x13c)\n[ 5.238464] [\u003cc0428040\u003e] (usb_register_driver+0x78/0x13c) from [\u003cc005b680\u003e] (do_one_initcall+0x34/0x188)\n[ 5.238494] [\u003cc005b680\u003e] (do_one_initcall+0x34/0x188) from [\u003cc00e11f0\u003e] (sys_init_module+0xb0/0x1c0)\n[ 5.238525] [\u003cc00e11f0\u003e] (sys_init_module+0xb0/0x1c0) from [\u003cc0065c40\u003e] (ret_fast_syscall+0x0/0x30)\n\nMove the two offenders to the private structure which is kmalloc-ed,\nand thus safe.\n\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nCc: Steve Glendinning \u003csteve.glendinning@smsc.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7a6362800cb7d1d618a697a650c7aaed3eb39320", "tree": "087f9bc6c13ef1fad4b392c5cf9325cd28fa8523", "parents": [ "6445ced8670f37cfc2c5e24a9de9b413dbfc788d", "ceda86a108671294052cbf51660097b6534672f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 16:29:25 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 16:29:25 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)\n bonding: enable netpoll without checking link status\n xfrm: Refcount destination entry on xfrm_lookup\n net: introduce rx_handler results and logic around that\n bonding: get rid of IFF_SLAVE_INACTIVE netdev-\u003epriv_flag\n bonding: wrap slave state work\n net: get rid of multiple bond-related netdevice-\u003epriv_flags\n bonding: register slave pointer for rx_handler\n be2net: Bump up the version number\n be2net: Copyright notice change. Update to Emulex instead of ServerEngines\n e1000e: fix kconfig for crc32 dependency\n netfilter ebtables: fix xt_AUDIT to work with ebtables\n xen network backend driver\n bonding: Improve syslog message at device creation time\n bonding: Call netif_carrier_off after register_netdevice\n bonding: Incorrect TX queue offset\n net_sched: fix ip_tos2prio\n xfrm: fix __xfrm_route_forward()\n be2net: Fix UDP packet detected status in RX compl\n Phonet: fix aligned-mode pipe socket buffer header reserve\n netxen: support for GbE port settings\n ...\n\nFix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c\nwith the staging updates.\n" }, { "commit": "e6bee325e49f17c65c1fd66e9e8b348c85788341", "tree": "bcc9e5d8e82efa9009edd481a837cc3626360091", "parents": [ "a5e6b135bdff649e4330f98e2e80dbb1984f7e77", "6ae705b23be8da52d3163be9d81e9b767876aaf9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:11:04 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 16 15:11:04 2011 -0700" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)\n pch_uart: reference clock on CM-iTC\n pch_phub: add new device ML7213\n n_gsm: fix UIH control byte : P bit should be 0\n n_gsm: add a documentation\n serial: msm_serial_hs: Add MSM high speed UART driver\n tty_audit: fix tty_audit_add_data live lock on audit disabled\n tty: move cd1865.h to drivers/staging/tty/\n Staging: tty: fix build with epca.c driver\n pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()\n Staging: generic_serial: fix double locking bug\n nozomi: don\u0027t use flush_scheduled_work()\n tty/serial: Relax the device_type restriction from of_serial\n MAINTAINERS: Update HVC file patterns\n tty: phase out of ioctl file pointer for tty3270 as well\n tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile\n pch_uart: Fix DMA channel miss-setting issue.\n pch_uart: fix exclusive access issue\n pch_uart: fix auto flow control miss-setting issue\n pch_uart: fix uart clock setting issue\n pch_uart : Use dev_xxx not pr_xxx\n ...\n\nFix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied\ntwice, then changes to the same area in one branch)\n" }, { "commit": "468c3f924f043cad7a04f4f4d5224a2c9bc886c1", "tree": "124213e020ed944cb879165a8f6233aff1066182", "parents": [ "ac90fa63432b3c03c189c39e62211d3b80418c30" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Sun Mar 13 06:54:31 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 14 15:24:18 2011 -0700" }, "message": "NET: cdc-phonet, handle empty phonet header\n\nCurrently, for N 5800 XM I get:\ncdc_phonet: probe of 1-6:1.10 failed with error -22\n\nIt\u0027s because phonet_header is empty. Extra altsetting looks like\nthere:\nE 05 24 00 01 10 03 24 ab 05 24 06 0a 0b 04 24 fd .$....$..$....$.\nE 00 .\n\nI don\u0027t see the header used anywhere so just check if the phonet\ndescriptor is there, not the structure itself.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ac90fa63432b3c03c189c39e62211d3b80418c30", "tree": "f53a67bf563984b5aa4ec8b551e29c88461a08b8", "parents": [ "e9a799ea4a5551d20e458a45b541df0bbf8f1804" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Sun Mar 13 06:54:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Mar 14 15:23:21 2011 -0700" }, "message": "NET: cdc-phonet, fix stop-queue handling\n\nCurrently there is a warning emitted by the cdc-phonet driver:\nWARNING: at include/linux/netdevice.h:1557 usbpn_probe+0x3bb/0x3f0 [cdc_phonet]()\nModules linked in: ...\nPid: 5877, comm: insmod Not tainted 2.6.37.3-16-desktop #1\nCall Trace:\n [\u003cffffffff810059b9\u003e] dump_trace+0x79/0x340\n [\u003cffffffff81520fdc\u003e] dump_stack+0x69/0x6f\n [\u003cffffffff810580eb\u003e] warn_slowpath_common+0x7b/0xc0\n [\u003cffffffffa00254fb\u003e] usbpn_probe+0x3bb/0x3f0 [cdc_phonet]\n...\n---[ end trace f5d3e02908603ab4 ]---\nnetif_stop_queue() cannot be called before register_netdev()\n\nSo remove netif_stop_queue from the probe funtction to avoid that.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f227e08b71b9c273eaa29a57370a3a5b833aa382", "tree": "9f1483776a2bde3bb1a6bd744e69acf19f6f3428", "parents": [ "fec38d1752c01ad72789bac9f1a128f7e933735d", "f5412be599602124d2bdd49947b231dd77c0bf99" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 24 11:36:31 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 24 11:36:31 2011 -0800" }, "message": "Merge 2.6.38-rc6 into tty-next\n\nThis was to resolve a merge issue with drivers/char/Makefile and\ndrivers/tty/serial/68328serial.c\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "67158cebde60edb1a11cf4743f1cb9ded847c5fc", "tree": "df2f29f9cebaee1777f184cf823229c178515011", "parents": [ "108f518cc4f81eb8e3b46a0bd5cb902ef90a51a8" ], "author": { "name": "Shahar Havivi", "email": "shaharh@redhat.com", "time": "Tue Feb 22 04:41:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 23 14:32:28 2011 -0800" }, "message": "Added support for usb ethernet (0x0fe6, 0x9700)\n\nThe device is very similar to (0x0fe6, 0x8101),\nAnd works well with dm9601 driver.\n\nSigned-off-by: Shahar Havivi \u003cshaharh@redhat.com\u003e\nAcked-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6caa76b7786891b42b66a0e61e2c2fff2c884620", "tree": "eb6e387e080a44680d6d8686999336e69ec97e71", "parents": [ "00a0d0d65b61241a718d0aee96f46b9a2d93bf26" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon Feb 14 16:27:22 2011 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 17 11:59:56 2011 -0800" }, "message": "tty: now phase out the ioctl file pointer for good\n\nOnly oddities here are a couple of drivers that bogusly called the ldisc\nhelpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes\naway.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "20b9d17715017ae4dd4ec87fabc36d33b9de708e", "tree": "64e9c4ff845844298f9056357d9f4914802207f8", "parents": [ "60b33c133ca0b7c0b6072c87234b63fee6e80558" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon Feb 14 16:26:50 2011 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 17 11:52:43 2011 -0800" }, "message": "tiocmset: kill the file pointer argument\n\nDoing tiocmget was such fun we should do tiocmset as well for the same\nreasons\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "60b33c133ca0b7c0b6072c87234b63fee6e80558", "tree": "379340a7ab563df42ddb2907be6f282202244077", "parents": [ "adf9251fe9b87b5a50deebe489db2df8df4715fc" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon Feb 14 16:26:14 2011 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Feb 17 11:47:33 2011 -0800" }, "message": "tiocmget: kill off the passing of the struct file\n\nWe don\u0027t actually need this and it causes problems for internal use of\nthis functionality. Currently there is a single use of the FILE * pointer.\nThat is the serial core which uses it to check tty_hung_up_p. However if\nthat is true then IO_ERROR is also already set so the check may be removed.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "5b89db0e84bef81f6aa324f8f22a9258ff873de3", "tree": "6672d8af700cdc0424b800bde17082622e2de96d", "parents": [ "c978e7bb77dfd2cd3d1f547fa4e395cfe47f02b2" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sun Feb 13 11:15:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 13 16:55:45 2011 -0800" }, "message": "Net, USB, Option, hso: Do not dereference NULL pointer\n\nIn drivers/net/usb/hso.c::hso_create_bulk_serial_device() we have this\ncode:\n...\n\tserial \u003d kzalloc(sizeof(*serial), GFP_KERNEL);\n\tif (!serial)\n\t\tgoto exit;\n...\nexit:\n\thso_free_tiomget(serial);\n...\nhso_free_tiomget() directly dereferences its argument, which in the\nexample above is a NULL pointer, ouch.\nI could just add a \u0027if (serial)\u0027 test at the \u0027exit\u0027 label, but since most\nfreeing functions in the kernel accept NULL pointers (and it seems like\nthis was also assumed here) I opted to instead change \u0027hso_free_tiomget()\u0027\nso that it is safe to call it with a NULL argument. I also modified the\nfunction to get rid of a pointles conditional before the call to\n\u0027usb_free_urb()\u0027 since that function already tests for NULL itself -\nbesides fixing the NULL deref this change also buys us a few bytes in\nsize.\nBefore:\n$ size drivers/net/usb/hso.o\n text data bss dec hex filename\n 32200 592 9960 42752 a700 drivers/net/usb/hso.o\nAfter:\n$ size drivers/net/usb/hso.o\n text data bss dec hex filename\n 32196 592 9960 42748 a6fc drivers/net/usb/hso.o\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab60707ffe9920b66b4fff5181b44b14cd091472", "tree": "d0baa22dfe87b87b0188ac0305d05fa7454a5c3c", "parents": [ "d3337de52af7fb0ebe605b02b740be4ee7dee9eb" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Thu Feb 10 10:58:45 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 13 11:21:15 2011 -0800" }, "message": "USB Network driver infrastructure: Fix leak when usb_autopm_get_interface() returns less than zero in kevent().\n\nWe\u0027ll leak the memory allocated to \u0027urb\u0027 in\ndrivers/net/usb/usbnet.c:kevent() when we \u0027goto fail_lowmem\u0027 and the \u0027urb\u0027\nvariable goes out of scope while still completely unused.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "84e77a8bc73cad2f910cc981f266904c66a17825", "tree": "461520f8e7fedc3d806826e1acc5c86c6fd5a7c7", "parents": [ "3a9dda7602e566014a859faaf8490e6454683ab1" ], "author": { "name": "Alexey Orishko", "email": "alexey.orishko@gmail.com", "time": "Mon Feb 07 09:45:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 08 13:54:43 2011 -0800" }, "message": "USB CDC NCM errata updates for cdc_ncm host driver\n\nSpecification links:\n- CDC NCM errata link:\n http://www.usb.org/developers/devclass_docs/NCM10_012011.zip\n- CDC and WMC errata link:\n http://www.usb.org/developers/devclass_docs/CDC1.2_WMC1.1_012011.zip\n\nChanges:\n- driver updated to match cdc.h header with errata changes\n- added support for USB_CDC_SET_NTB_INPUT_SIZE control request with\n 8 byte length\n- fixes to comply with specification: send only control requests supported by\n device, set number of datagrams for IN direction, connection speed structure\n update, etc.\n- packet loss fixed for tx direction; misleading flag renamed.\n- adjusted hard_mtu value.\n\nSigned-off-by: Alexey Orishko \u003calexey.orishko@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "986e3f6e2b4582d9a7e61de5090042d5af85da44", "tree": "8f5f26ea8ae242c242b71d7a50c859852cee8cb5", "parents": [ "2321f3b4afc7c017f34b0cad0624b3b9ebdf2ba4" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sun Jan 23 12:19:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 24 23:20:24 2011 -0800" }, "message": "USB NET KL5KUSB101: Fix mem leak in error path of kaweth_download_firmware()\n\nWe will leak the storage allocated by request_firmware() if the size of\nthe firmware is greater than KAWETH_FIRMWARE_BUF_SIZE.\nThis removes the leak by calling release_firmware() before we return\n-ENOSPC.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f742aa8acb7e50a383f6d2b00b1c52e081970d38", "tree": "365776e1df59f97ebad512ab61f57a704495bc72", "parents": [ "1956cc52e73984a39252994f0beee458fc0d8909" ], "author": { "name": "Alexey Orishko", "email": "alexey.orishko@gmail.com", "time": "Mon Jan 17 07:07:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 18 16:13:50 2011 -0800" }, "message": "USB CDC NCM: tx_fixup() race condition fix\n\n- tx_fixup() can be called from either timer callback or from xmit()\n in usbnet, so spinlock is added to avoid concurrency-related problem.\n- minor correction due to checkpatch warning for some line over 80\n chars after previous patch was applied.\n\nSigned-off-by: Alexey Orishko \u003calexey.orishko@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e56790ad31d72a5a44142af462d047c0c897b29", "tree": "0557144779a2ad51093110dce0cdc163592e15fb", "parents": [ "e84f885ebfb43b1ebb1481ee8bb2018743f947e9" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Thu Jan 13 11:40:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 13 21:48:26 2011 -0800" }, "message": "USB CDC NCM: Don\u0027t deref NULL in cdc_ncm_rx_fixup() and don\u0027t use uninitialized variable.\n\nskb_clone() dynamically allocates memory and may fail. If it does it\nreturns NULL. This means we\u0027ll dereference a NULL pointer in\ndrivers/net/usb/cdc_ncm.c::cdc_ncm_rx_fixup().\nAs far as I can tell, the proper way to deal with this is simply to goto\nthe error label.\n\nFurthermore gcc complains that \u0027skb\u0027 may be used uninitialized:\n drivers/net/usb/cdc_ncm.c: In function ‘cdc_ncm_rx_fixup’:\n drivers/net/usb/cdc_ncm.c:922:18: warning: ‘skb’ may be used uninitialized in this function\nand I believe it is right. On the line where we\n pr_debug(\"invalid frame detected (ignored)\" ...\nwe are using the local variable \u0027skb\u0027 but nothing has ever been assigned\nto that variable yet. I believe the correct fix for that is to use\n\u0027skb_in\u0027 instead.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f5260f02e7903bb10e45b1bf3500eab6425edf5c", "tree": "e4a77d6012e352bd4d3a82612d38d6d63caa16db", "parents": [ "0268102d53c872b42e214f95492065c8058b042e" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Dec 25 12:23:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 31 11:11:38 2010 -0800" }, "message": "USB: cdc_ether: remove unneeded check\n\nWe already verified that \"dev-\u003eudev-\u003eactconfig-\u003eextralen\" was non-zero\nso \"len\" is non-zero here as well.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Oliver Neukum \u003coneukum@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "17f7f4d9fcce8f1b75b5f735569309dee7665968", "tree": "14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a", "parents": [ "041110a439e21cd40709ead4ffbfa8034619ad77", "d7c1255a3a21e98bdc64df8ccf005a174d7e6289" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 26 22:37:05 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 26 22:37:05 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/ipv4/fib_frontend.c\n" }, { "commit": "0e214ad81545a35c5e62a4c2d6cf7275fd7a545f", "tree": "8327c0394729760d43ba7ba1548d9afbfba9670c", "parents": [ "fdac1e0697356ac212259f2147aa60c72e334861" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri Dec 17 03:25:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 23 10:21:12 2010 -0800" }, "message": "USB: mcs7830: return negative if auto negotiate fails\n\nThe original code returns 0 on success and 1 on failure. In fact, at\nthis point, \"ret\" is already either zero or a negative error code so\nwe can just return it directly.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5591c75dc345d93d353d2ab2962824648a73efe4", "tree": "a30401fe622d24bdcc2ca8b95319fa1a31eb909d", "parents": [ "b6bc765067ece933cc3dc7f5e95665a89100b1d5" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Dec 21 02:16:09 2010 -0800" }, "committer": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Dec 21 02:16:09 2010 -0800" }, "message": "usb: Use static const, consolidate code\n\nUsing static const generally increases object text and decreases data size.\nIt also generally decreases overall object size.\n\nConsolidate duplicated code into new fix_crc_bug function\nand declare data in that function static const.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\n" }, { "commit": "d9993be65a77f500ae926176baa264816bfe3816", "tree": "bbb8c86114bf86e5ca3d1fbf89de3d98be5519ba", "parents": [ "c4266263249f22479eb1abb1a1709c38240b1597", "aa3e219997e4b949be4199660936099ded0b401f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 20 13:24:14 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 20 13:24:14 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "bbccc16c8a27d75dabe88326f7074181493a3b69", "tree": "991656c863dae88943246b6bdd581fb10069e646", "parents": [ "173021072e86a0a5b3d2271347493a3e0d5f68e8" ], "author": { "name": "Andreas Mohr", "email": "andi@lisas.de", "time": "Mon Dec 20 10:38:47 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 20 10:38:47 2010 -0800" }, "message": "net: Add USB PID for new MOSCHIP USB ethernet controller MCS7832 variant\n\nDue to active notification of the new MCS7832 version by the manufacturer\n(Mr. Milton; thanks!) -- quote: \"functionality same as MCS7830\",\nI\u0027m now submitting this patch (on -rc6), intended for networking.git and -stable.\n\n- add MCS7832 USB PID to be able to support this new device variant, too\n- add related descriptions\n\nSigned-off-by: Andreas Mohr \u003candi@lisas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4aa9e05a61b845541fa6f5b1d246976922601f0", "tree": "ca94478c3df281ab76a3399f5ba6341ade3f5791", "parents": [ "1dc0f3c54ce1df957f99c17b145488fd03eb1a59", "4b8fe66300acb2fba8b16d62606e0d30204022fc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x.h\n\tdrivers/net/wireless/iwlwifi/iwl-1000.c\n\tdrivers/net/wireless/iwlwifi/iwl-6000.c\n\tdrivers/net/wireless/iwlwifi/iwl-core.h\n\tdrivers/vhost/vhost.c\n" }, { "commit": "f4680d3db71f13d2764340a9880745bf54f2469d", "tree": "760768baf30dd912946c052b096f137005c2de6c", "parents": [ "46814e08d80f87449b5adb3d549a3cae6f9f8148" ], "author": { "name": "Arnaud Ebalard", "email": "arno@natisbad.org", "time": "Wed Dec 15 12:16:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 11:50:20 2010 -0800" }, "message": "asix: add USB ID for Logitec LAN-GTJ U2A\n\nLogitec LAN-GTJ U2A (http://www.pro.logitec.co.jp/pro/g/gLAN-GTJU2A/)\nUSB 2.0 10/10/1000 Ethernet adapter is based on ASIX AX88178 chipset.\n\nThis patch adds missing USB ID for the device.\n\nSigned-off-by: Arnaud Ebalard \u003carno@natisbad.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55508d601dab7df5cbcc7a63f4be8620eface204", "tree": "346f30fae9c726d2e73aba2e37ce1e4a31dcea8c", "parents": [ "04fb451eff978ca059399eab83d5594b073caf6f" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Dec 14 15:24:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 16 14:43:14 2010 -0800" }, "message": "net: Use skb_checksum_start_offset()\n\nReplace skb-\u003ecsum_start - skb_headroom(skb) with skb_checksum_start_offset().\n\nNote for usb/smsc95xx: skb-\u003edata - skb-\u003ehead \u003d\u003d skb_headroom(skb).\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23f333a2bfafba80339315b724808982a9de57d9", "tree": "55819e6a8eeb9c2d34b42c77e7e38f7f6571baf9", "parents": [ "6e07ebd84eef00be9e169a6d15a0bc20b06578fa" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Dec 12 16:45:14 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sun Dec 12 16:45:14 2010 +0100" }, "message": "drivers/net: don\u0027t use flush_scheduled_work()\n\nflush_scheduled_work() is on its way out. This patch contains simple\nconversions to replace flush_scheduled_work() usage with direct\ncancels and flushes.\n\nDirectly cancel the used works on driver detach and flush them in\nother cases.\n\nThe conversions are mostly straight forward and the only dangers are,\n\n* Forgetting to cancel/flush one or more used works.\n\n* Cancelling when a work should be flushed (ie. the work must be\n executed once scheduled whether the driver is detaching or not).\n\nI\u0027ve gone over the changes multiple times but it would be much\nappreciated if you can review with the above points in mind.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jay Cliburn \u003cjcliburn@gmail.com\u003e\nCc: Michael Chan \u003cmchan@broadcom.com\u003e\nCc: Divy Le Ray \u003cdivy@chelsio.com\u003e\nCc: e1000-devel@lists.sourceforge.net\nCc: Vasanthy Kolluri \u003cvkolluri@cisco.com\u003e\nCc: Samuel Ortiz \u003csamuel@sortiz.org\u003e\nCc: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nCc: Andrew Gallatin \u003cgallatin@myri.com\u003e\nCc: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nCc: Ramkrishna Vepa \u003cramkrishna.vepa@exar.com\u003e\nCc: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nCc: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nCc: Shreyas Bhatewara \u003csbhatewara@vmware.com\u003e\nCc: netdev@vger.kernel.org\n" }, { "commit": "6934d33556b366d22392a415ca09d720fed6a442", "tree": "874ee3637633274988824d0b53d93df83ec29fe0", "parents": [ "78347c8c6b2ddf20535bc1b18d749a3bbdea2a60" ], "author": { "name": "Thomas Bogendoerfer", "email": "tsbogend@alpha.franken.de", "time": "Tue Dec 07 22:21:52 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 09 20:42:24 2010 -0800" }, "message": "hso: IP checksuming doesn\u0027t work on GE0301 option cards\n\nThere is definitly a problem, that some option cards send up broken\nIP pakets leading to corrupted IP packets. These corruptions aren\u0027t\ndetected, because the driver claims that the packets are already\nchecksummed. This change removes the CHECKSUM_UNNECESSARY option\nand let IP detect broken data.\n\nSigned-off-by: Thomas Bogendoerfer \u003ctsbogend@alpha.franken.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fe6c791570efe717946ea7b7dd50aec96b70d551", "tree": "1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434", "parents": [ "f8bf5681cf15f77692c8ad8cb95d059ff7c622c9", "f19872575ff7819a3723154657a497d9bca66b33" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 08 13:15:38 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 08 13:47:38 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/wireless/ath/ath9k/ar9003_eeprom.c\n\tnet/llc/af_llc.c\n" }, { "commit": "900d495a189dc3ff5952b98a77d18e3018f8286c", "tree": "34db984d866c5c96bee77940310a0000737b03ae", "parents": [ "073285fd392f6dc901da7c698d46e1e2a7e26436" ], "author": { "name": "Alexey Orishko", "email": "alexey.orishko@gmail.com", "time": "Mon Nov 29 23:23:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 06 12:59:03 2010 -0800" }, "message": "USB CDC NCM host driver\n\nThe patch provides USB CDC NCM host driver support in the Linux Kernel.\n\nChanges:\ndrivers/net/usb/cdc_ncm.c:\n- initial submission of the CDC NCM host driver;\n- verified on Intel 32/64 bit, Intel Atom, ST-Ericsson U8500 (ARM)\n- throughput measured over 100 Mbits duplex;\n- driver supports 16-bit NTB format only, but it is more than enough for\n transfers up to 64K;\n- driver can handle up to 32 datagrams in received NTB;\n- timer is used to collect several packets in Tx direction\n\ndrivers/net/usb/Kconfig:\n- a new entry to compile CDC NCM host driver\ndrivers/net/usb/Makefile:\n- a new entry to compile CDC NCM host driver\n\nSigned-off-by: Alexey Orishko \u003calexey.orishko@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "073285fd392f6dc901da7c698d46e1e2a7e26436", "tree": "5207bc21a56d42eb9f86811068a8c55772b451f0", "parents": [ "5ee493767352314893520ac40aec5bb07d0147e0" ], "author": { "name": "Alexey Orishko", "email": "alexey.orishko@gmail.com", "time": "Mon Nov 29 23:23:27 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 06 12:59:02 2010 -0800" }, "message": "usbnet: changes for upcoming cdc_ncm driver\n\nChanges:\ninclude/linux/usb/usbnet.h:\n- a new flag to indicate driver\u0027s capability to accumulate IP packets in Tx\n direction and extract several packets from single skb in Rx direction.\ndrivers/net/usb/usbnet.c:\n- the procedure of counting packets in usbnet was updated due to the\n accumulating of IP packets in the driver\n- no short packets are sent if indicated by the flag in driver_info\n structure\n\nSigned-off-by: Alexey Orishko \u003calexey.orishko@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8e65c0ece6f2aa732f9b755331869c67aeb1c7f6", "tree": "eb7a5c26bfc87ed661fe42b35fcfb31356915682", "parents": [ "03fe5f3ef7eab88e1405baa52a7923fbf337230b" ], "author": { "name": "Filip Aben", "email": "f.aben@option.com", "time": "Thu Nov 25 03:40:50 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Nov 28 11:46:44 2010 -0800" }, "message": "hso: fix disable_net\n\nThe HSO driver incorrectly creates a serial device instead of a net\ndevice when disable_net is set. It shouldn\u0027t create anything for the\nnetwork interface.\n\nSigned-off-by: Filip Aben \u003cf.aben@option.com\u003e\nReported-by: Piotr Isajew \u003cpki@ex.com.pl\u003e\nReported-by: Johan Hovold \u003cjhovold@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8739cfef1ab8bc02e1bf38c02399afe62f3a7800", "tree": "122e91079360ddad9d141076e7d21bae46a48484", "parents": [ "b16fed0af8416ee0fe9af6c1977f7b05e7e7c9b2" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Nov 15 11:12:29 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 17 10:36:52 2010 -0800" }, "message": "drivers/net/usb: Remove unnecessary casts of netdev_priv\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ce5a121304af02d02489e86efb6ae26a67f95e52", "tree": "ebd46ae84af69add5938eea815a7f72124bf8c54", "parents": [ "ec1e5610c00c7f5bc530d2aadd47faa473b90a30" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Mon Nov 15 07:30:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 15 11:13:18 2010 -0800" }, "message": "hso: Fix unused variable warning\n\nFallout from the TIOCGICOUNT work\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9c413ed55d5b52159e85a3937cda7f210a318048", "tree": "38d7bae3e922c2083027f9011029609feb3ea65e", "parents": [ "c389ff80d4b598f57d56aa807d396d4351cac8a4" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sat Oct 30 11:08:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 09 09:22:31 2010 -0800" }, "message": "drivers/net/usb: Update WARN uses\n\nAdd missing newlines.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b0786b430c982dffbb44d8030e6b6088671ce745", "tree": "033192c4b031a0b3a800c5e340ddeb7387ecff50", "parents": [ "6f9b901823aafd14a84ae27f61ff28bafed01260" ], "author": { "name": "Ming Lei", "email": "tom.leiming@gmail.com", "time": "Mon Nov 01 07:11:54 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 01 07:11:54 2010 -0700" }, "message": "usbnet: fix usb_autopm_get_interface failure(v1)\n\nSince usbnet already took usb runtime pm, we have to\nenable runtime pm for usb interface of usbnet, otherwise\nusb_autopm_get_interface may return failure and cause\n\u0027ifconfig usb0 up\u0027 failed if USB_SUSPEND(RUNTIME_PM) is\nenabled.\n\nCc: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Ben Hutchings \u003cben@decadent.org.uk\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Oliver Neukum \u003coliver@neukum.org\u003e\nCc: Andy Shevchenko \u003candy.shevchenko@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Ming Lei \u003ctom.leiming@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "229aebb873e29726b91e076161649cf45154b0bf", "tree": "acc02a3702215bce8d914f4c8cc3d7a1382b1c67", "parents": [ "8de547e1824437f3c6af180d3ed2162fa4b3f389", "50a23e6eec6f20d55a3a920e47adb455bff6046e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n Update broken web addresses in arch directory.\n Update broken web addresses in the kernel.\n Revert \"drivers/usb: Remove unnecessary return\u0027s from void functions\" for musb gadget\n Revert \"Fix typo: configuation \u003d\u003e configuration\" partially\n ida: document IDA_BITMAP_LONGS calculation\n ext2: fix a typo on comment in ext2/inode.c\n drivers/scsi: Remove unnecessary casts of private_data\n drivers/s390: Remove unnecessary casts of private_data\n net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data\n drivers/infiniband: Remove unnecessary casts of private_data\n drivers/gpu/drm: Remove unnecessary casts of private_data\n kernel/pm_qos_params.c: Remove unnecessary casts of private_data\n fs/ecryptfs: Remove unnecessary casts of private_data\n fs/seq_file.c: Remove unnecessary casts of private_data\n arm: uengine.c: remove C99 comments\n arm: scoop.c: remove C99 comments\n Fix typo configue \u003d\u003e configure in comments\n Fix typo: configuation \u003d\u003e configuration\n Fix typo interrest[ing|ed] \u003d\u003e interest[ing|ed]\n Fix various typos of valid in comments\n ...\n\nFix up trivial conflicts in:\n\tdrivers/char/ipmi/ipmi_si_intf.c\n\tdrivers/usb/gadget/rndis.c\n\tnet/irda/irnet/irnet_ppp.c\n" }, { "commit": "5f05647dd81c11a6a165ccc8f0c1370b16f3bcb0", "tree": "7851ef1c93aa1aba7ef327ca4b75fd35e6d10f29", "parents": [ "02f36038c568111ad4fc433f6fa760ff5e38fab4", "ec37a48d1d16c30b655ac5280209edf52a6775d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 23 11:47:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 23 11:47:02 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits)\n bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.\n vlan: Calling vlan_hwaccel_do_receive() is always valid.\n tproxy: use the interface primary IP address as a default value for --on-ip\n tproxy: added IPv6 support to the socket match\n cxgb3: function namespace cleanup\n tproxy: added IPv6 support to the TPROXY target\n tproxy: added IPv6 socket lookup function to nf_tproxy_core\n be2net: Changes to use only priority codes allowed by f/w\n tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled\n tproxy: added tproxy sockopt interface in the IPV6 layer\n tproxy: added udp6_lib_lookup function\n tproxy: added const specifiers to udp lookup functions\n tproxy: split off ipv6 defragmentation to a separate module\n l2tp: small cleanup\n nf_nat: restrict ICMP translation for embedded header\n can: mcp251x: fix generation of error frames\n can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set\n can-raw: add msg_flags to distinguish local traffic\n 9p: client code cleanup\n rds: make local functions/variables static\n ...\n\nFix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and\ndrivers/net/wireless/ath/ath9k/debug.c as per David\n" }, { "commit": "0bca1b913affbd7e2fdaffee62a499659a466eb5", "tree": "a7e1c20146790345c0cdcadb31b4ff908d1632c2", "parents": [ "d281da7ff6f70efca0553c288bb883e8605b3862" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Sep 16 18:21:40 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Oct 22 10:20:04 2010 -0700" }, "message": "tty: Convert the USB drivers to the new icount interface\n\nSimple pasting job using the new ops function. Also fix a couple of devices\ndirectly returning the internal struct (which happens at this point to match\nfor the fields that matter but isn\u0027t correct or futureproof)\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f4e8ab7cc4e819011ca6325e54383b3da7a5d130", "tree": "0a8587e0cafd2a436ff3b3fde7881048c9e4cf9a", "parents": [ "fdb246f526e422b18b48d578085c01ab28ec2c33" ], "author": { "name": "Bernard Blackham", "email": "bernard@largestprime.net", "time": "Mon Oct 18 13:16:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Oct 21 03:09:48 2010 -0700" }, "message": "smsc95xx: generate random MAC address once, not every ifup\n\nThe smsc95xx driver currently generates a new random MAC address\nevery time the interface is brought up. This makes it impossible to\noverride using the standard `ifconfig hw ether` approach.\n\nPast patches tried to make the MAC address a module parameter or\nbase it off the die ID, but it seems to me much simpler (and\nhopefully less controversial) to stick with the current random\ngeneration scheme, but allow the user to change the address.\n\nThis patch does exactly that - it moves the random address\ngeneration from smsc95xx_reset() into smsc95xx_bind(), so that it is\ndone once on module load, not on every ifup. The user can then\noverride this using the standard mechanisms.\n\nApplies against 2.6.35 and linux-2.6 head.\n\nSigned-off-by: Bernard Blackham \u003cb-omap@largestprime.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "631dd1a885b6d7e9f6f51b4e5b311c2bb04c323c", "tree": "c431fa3479c1d35842fb5635ed7ccd487d063a62", "parents": [ "d7eccbbae84b2ee7dbb756e60287c4b47071444e" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Oct 18 11:03:14 2010 +0200" }, "message": "Update broken web addresses in the kernel.\n\nThe patch below updates broken web addresses in the kernel\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nCc: Maciej W. Rozycki \u003cmacro@linux-mips.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nCc: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Dimitry Torokhov \u003cdmitry.torokhov@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nAcked-by: Ben Pfaff \u003cblp@cs.stanford.edu\u003e\nAcked-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nReviewed-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e40051d134f7ee95c8c1f7a3471e84eafc9ab326", "tree": "88eb44e49a75721ae926665a2c42f08badac9d07", "parents": [ "42099d7a3941d4aaf853caac92b3ae76149fc6e7", "2cc6d2bf3d6195fabcf0febc192c01f99519a8f3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/qlcnic/qlcnic_init.c\n\tnet/ipv4/ip_output.c\n" }, { "commit": "807540baae406c84dcb9c1c8ef07a56d2d2ae84a", "tree": "ccd5c2cb57710dd6b73cf8df11eedf67abc14ae4", "parents": [ "cb4dfe562cac6fcb544df752e40c1d78000d0712" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Sep 23 05:40:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:34:29 2010 -0700" }, "message": "drivers/net: return operator cleanup\n\nChange \"return (EXPR);\" to \"return EXPR;\"\n\nreturn is not a function, parentheses are not required.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7011e660938fc44ed86319c18a5954e95a82ab3e", "tree": "ae74316fe3fe11113a1fa0bf150fc8a454143f5b", "parents": [ "e71895a1beff2014534c9660d9ae42e043f11555" ], "author": { "name": "Dan Rosenberg", "email": "drosenberg@vsecurity.com", "time": "Wed Sep 15 11:43:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 16 21:54:59 2010 -0700" }, "message": "drivers/net/usb/hso.c: prevent reading uninitialized memory\n\nFixed formatting (tabs and line breaks).\n\nThe TIOCGICOUNT device ioctl allows unprivileged users to read\nuninitialized stack memory, because the \"reserved\" member of the\nserial_icounter_struct struct declared on the stack in hso_get_count()\nis not altered or zeroed before being copied back to the user. This\npatch takes care of it.\n\nSigned-off-by: Dan Rosenberg \u003cdan.j.rosenberg@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "441993da47777d961300c070fe1210600af48ad8", "tree": "ac2722e8764426c9275f239db6f5492ce8705620", "parents": [ "7dbfdc2390afc4e244817ab26d5a1b987b0c0669" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Sat Sep 11 05:40:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 13 20:02:53 2010 -0700" }, "message": "cx82310_eth: allow empty URBs\n\nEmpty received URBs are currently counted as errors but the device sends them\nsometimes as part of regular traffic - so remove this check.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7dbfdc2390afc4e244817ab26d5a1b987b0c0669", "tree": "d423a8cf8dfab4c705a7d6f3ad4e41b5e76b1ca8", "parents": [ "d81e27cf4e2a5050245f9962539292ea2c9e2206" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Sat Sep 11 05:39:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 13 20:02:52 2010 -0700" }, "message": "cx82310_eth: check usb_string() return value for error\n\nFix that usb_string() return value is not checked for error (negative value).\nAlso change the ignore message a bit and lower its level to info.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e548833df83c3554229eff0672900bfe958b45fd", "tree": "85efc4a76dc356593d6d394776aeb845dc580fb6", "parents": [ "cbd9da7be869f676afc204e1a664163778c770bd", "053d8f6622701f849fda2ca2c9ae596c13599ba9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 22:27:33 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/mac80211/main.c\n" }, { "commit": "c9cedbba0fc591e1c0587f838932ca3f3c6fec57", "tree": "0e0111f7713bfb05974a42d803aa791b958af5be", "parents": [ "201b6bab6798fcd8ec1cb30165b91fdb89a91775" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Wed Sep 08 07:50:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 09 21:41:59 2010 -0700" }, "message": "ipheth: remove incorrect devtype to WWAN\n\nThe \u0027wwan\u0027 devtype is meant for devices that require preconfiguration\nand *every* time setup before the ethernet interface can be used, like\ncellular modems which require a series of setup commands on serial ports\nor other mechanisms before the ethernet interface will handle packets.\n\nAs ipheth only requires one-per-hotplug pairing setup with no\npreconfiguration (like APN, phone #, etc) and the network interface is\nusable at any time after that initial setup, remove the incorrect\ndevtype wwan.\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc28a20e77b261eb4e80c84abd621e810302f435", "tree": "184deb1e0ebbc63a0e04c3b57c38ee564ab9670d", "parents": [ "6febfca98f25c7ee5c3ff7fc85e048bf82230ad5" ], "author": { "name": "Ondrej Zary", "email": "linux@rainbow-software.org", "time": "Sat Sep 04 02:39:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 13:10:53 2010 -0700" }, "message": "introduce cx82310_eth: Conexant CX82310-based ADSL router USB ethernet driver\n\nThis patch introduces cx82310_eth driver - driver for USB ethernet port of\nADSL routers based on Conexant CX82310 chips. Such routers usually have\nethernet port(s) too which are bridged together with the USB ethernet port,\nallowing the USB-connected machine to communicate to the network (and also\ninternet through the ADSL, of course).\n\nThis is my first driver, so please check thoroughly. As there\u0027s no protocol\ndocumentation, it was done with usbsnoop dumps from Windows driver, some\nparts (the commands) inspired by cxacru driver and also other usbnet drivers.\nThe driver passed my testing - some real work and also pings sized from 0 to\n65507 B.\n\nThe only problem I found is the ifconfig error counter. When I return 0 (or 1\nbut empty skb) from rx_fixup(), usbnet increases the error counter although\nit\u0027s not an error condition (because packets can cross URB boundaries). Maybe\nthe usbnet should be fixed to allow rx_fixup() to return empty skbs (or some\nother value, e.g. 2)?\n\nThe USB ID of my device is 0x0572:0xcb01 which conflicts with some ADSL modems\nusing cxacru driver (they probably use the same chipset but simpler\nfirmware). The modems seem to use bDeviceClass 0 and iProduct \"ADSL USB\nMODEM\", my router uses bDeviceClass 255 and iProduct \"USB NET CARD\". The\ndriver matches only devices with class 255 and checks for the iProduct string\nduring init. I already posted a patch for the cxacru driver to ignore these\ndevices.\n\nSigned-off-by: Ondrej Zary \u003clinux@rainbow-software.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f95d76ab82c381ce2221fbe75f331ff1478732db", "tree": "73ba74e8018b1a38c04b3e638055264b85db7168", "parents": [ "9ee47476d6734c9deb9ae9ab05d963302f6b6150" ], "author": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Aug 23 12:39:29 2010 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Mon Aug 23 12:39:29 2010 +0200" }, "message": "ipheth: add support for iPhone 4\n\nThis adds support for the iPhone 4 to the ipheth driver.\n\nAcked-by: Diego Giagio \u003cdiego@giagio.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "01414802054c382072b6cb9a1bdc6e243c74b2d5", "tree": "f09b05eb9fff16a69d83ec28653992d1bae8d74c", "parents": [ "bb8a10bbd10a45db0eb45bac520489bdbc0917ef" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Aug 17 02:31:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 02:31:15 2010 -0700" }, "message": "ethtool: Provide a default implementation of ethtool_ops::get_drvinfo\n\nThe driver name and bus address for a net_device can normally be found\nthrough the driver model now. Instead of requiring drivers to provide\nthis information redundantly through the ethtool_ops::get_drvinfo\noperation, use the driver model to do so if the driver does not define\nthe operation. Since ETHTOOL_GDRVINFO no longer requires the driver\nto implement any operations, do not require net_device::ethtool_ops to\nbe set either.\n\nRemove implementations of get_drvinfo and ethtool_ops that provide\nonly this information.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dacb397511289154a68dea1f4bd674c660161c23", "tree": "ad82840c1acd2f8e88d828cf8b8d819f1ca64f6f", "parents": [ "68fd26b59856b466edd14d8a90d01255983cd3ee" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 02:50:55 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 02:50:55 2010 -0700" }, "message": "usbnet: rx_submit() should return an error code.\n\nThis patch makes rx_submit() return an error code, and makes some call sites\nthat care check the return value. This is important because it lets us properly\nhandle cases where the device isn\u0027t ready to handle URB submissions (e.g., when\nit is autosuspended under some drivers); previously, we would attempt and fail\nto submit URBs and reschedule ourselves to try and fail again. This patch is\nagainst Linus\u0027s 2.6 repo commit 45d7f32c7a43cbb9592886d38190e379e2eb2226.\n\nSigned-Off-By: Elizabeth Jones \u003cellyjones@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23d23e409a51a3eaad17a8045d30fd9cf8fb8a03", "tree": "e8487724356612818ebf68bc693f0401ea4a5273", "parents": [ "a767bde4d484b60dab0abac740a7151b624a30bf" ], "author": { "name": "Christian Samsel", "email": "Christian.Samsel@rwth-aachen.de", "time": "Wed Aug 04 22:14:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 05 13:21:24 2010 -0700" }, "message": "usbnet: remove noisy and hardly useful printk\n\nWith turned on hspa modem (Dell 5530 internal card) and activated usb auto\nsuspend, my system gets up 100 \"usbnet_resume has delayed data\" per\nminute. I didnt noticed any pathological behaviour, so just drop\nthis message. if any objections, please at least change it to _DEBUG.\n\nSigned-off-by: Christian Samsel \u003cchristian.samsel@rwth-aachen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5c7bf2f4d6304ab4741f38365ca0c0223147263d", "tree": "39050477d41a3731c68dafb8651e0108827ad207", "parents": [ "96d8e90382dc336b5de401164597edfdc2e8d9f1" ], "author": { "name": "Filip Aben", "email": "f.aben@option.com", "time": "Tue Aug 03 05:36:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 03 16:40:52 2010 -0700" }, "message": "hso: Add new product ID\n\nThis patch adds a new product ID to the hso driver.\n\nSigned-off-by: Filip Aben \u003cf.aben@option.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66cc42a4bc23a5f621407d1c23b9fe29d41c92c6", "tree": "676739b334e957ac65eb7e36699acfc154ebd6d6", "parents": [ "db5824dd3d632acd79094b81e07288ba05ae2cc1" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Sun Jul 25 22:25:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 26 21:05:04 2010 -0700" }, "message": "usbnet: use jiffies in schedule_timeout(), not msecs\n\nusbnet_terminate_urbs() uses schedule_timeout() with argument 3 msecs.\nschedule_timeout() uses jiffies as argument, so convert msecs to jiffies\nwith msecs_to_jiffies().\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fd1f170dfc9d432061540422ddc97058154d94b9", "tree": "7b84c7ef7812ef08dbb365625ea4a67e3a4753bc", "parents": [ "5c4ac8c60aba4b2e9549d139586612855b0fea09" ], "author": { "name": "Andy Shevchenko", "email": "andy.shevchenko@gmail.com", "time": "Fri Jul 23 03:18:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 23 12:50:50 2010 -0700" }, "message": "usb: usbnet: use newly introduced hex_to_bin()\n\nSigned-off-by: Andy Shevchenko \u003candy.shevchenko@gmail.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: linux-usb@vger.kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "242647bcf8464860f173f3d4d4ab3490d3558518", "tree": "73896502e1ad7de3f6710da65325305af0d9ee0c", "parents": [ "55a40e243210b72169eaa1cbd9b6edc6097571f8" ], "author": { "name": "Filip Aben", "email": "f.aben@option.com", "time": "Mon Jul 12 21:21:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 21:21:27 2010 -0700" }, "message": "hso: remove driver version\n\nThis patch removes the driver version from the driver. This version\nhasn\u0027t changed since the driver\u0027s inclusion in the kernel and is a\nsource of confusion for some customers.\n\nSigned-off-by: Filip Aben \u003cf.aben@option.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597e608a8492d662736c9bc6aa507dbf1cadc17d", "tree": "6c330cdd0a4809f67dd191b37e34f5b4318cef78", "parents": [ "acbc0f039ff4b93da737c91937b7c70018ded39f", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "c31fd6c25c4619c0745b12cff842721a4bd4202c", "tree": "2f2c0efc80a2bcb949d06a20f738068c63fcd516", "parents": [ "396e799c3ac29f970c40bde87b76f4652c06df76" ], "author": { "name": "Oliver Neukum", "email": "oliver@neukum.org", "time": "Fri Jul 02 15:51:55 2010 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 05 18:50:55 2010 -0700" }, "message": "usbnet: remove direct access to urb-\u003estatus\n\nUSB drivers should not use urb-\u003estatus directly because\nit is scheduled to become a parameter. This does the conversion\nfor drivers/net/usb\n\nSigned-off-by: Oliver Neukum \u003coneukum@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0dacca73a3ddefa6cb8a7e0282f938e01faa1a64", "tree": "c97d70af9b4178ddf9284a376aa10d8882d84fa8", "parents": [ "7b00ac51ffcda994ef0839001257be894cc6e5a8" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Jul 02 21:49:02 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:49:02 2010 -0700" }, "message": "usbnet: Set parent device early for netdev_printk()\n\nnetdev_printk() follows the net_device\u0027s parent device pointer, so\nwe must set that earlier than we previously did.\n\nReported-by: Luís Picciochi Oliveira \u003cpitxyoki@gmail.com\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7b00ac51ffcda994ef0839001257be894cc6e5a8", "tree": "b19052580692616aaddefed434515aebe5e4568b", "parents": [ "c89827e0e9346c039aed9b63c14096c2d36796b1" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Jul 02 21:47:54 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:47:54 2010 -0700" }, "message": "net: Revert \"rndis_host: Poll status channel before control channel\"\n\nThis reverts commit c17b274dc2aa538b68c1f02b01a3c4e124b435ba.\n\nThat change was reported to break rndis_wlan support for the WUSB54GS.\n\nReported-by: Luís Picciochi Oliveira \u003cpitxyoki@gmail.com\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a9dbfe08ee17f0dc9ecff647eba3d04afa01200", "tree": "656ea2f5ab14d7f4a05230dc40fb37174b4aba38", "parents": [ "de847272149365363a6043a963a6f42fb91566e2" ], "author": { "name": "Nicolas Kaiser", "email": "nikai@nikai.net", "time": "Sat Jun 26 06:58:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 10:26:16 2010 -0700" }, "message": "usb: pegasus: fixed coding style issues\n\nFixed brace, static initialization, comment, whitespace and spacing\ncoding style issues.\n\nSigned-off-by: Nicolas Kaiser \u003cnikai@nikai.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8244132ea89cdd128003f5b9980fab50d8d36d72", "tree": "c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95", "parents": [ "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd", "38000a94a902e94ca8b5498f7871c6316de8957a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/ipv4/ip_output.c\n" }, { "commit": "d5dc0ae4df9db00b8122378d56a071039b17a1eb", "tree": "0c35e123185cc6d74993160a3af0c20604375b26", "parents": [ "26cde9f7e2747b6d254b704594eed87ab959afa5" ], "author": { "name": "Filip Aben", "email": "f.aben@option.com", "time": "Tue Jun 22 10:10:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 22 10:10:35 2010 -0700" }, "message": "hso: remove setting of low_latency flag\n\nThis patch removes the setting of the low_latency flag. \ntty_flip_buffer_push() is occasionally being called in irq context, which \ncauses a hang if the low_latency flag is set.\nRemoving the low_latency flag only seems to impact the flush to ldisc, \nwhich will now be put on a workqueue.\n\nSigned-off-by: Filip Aben \u003cf.aben@option.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ccef431a2994bb8a722d0fbc6c6da2bdbf86834", "tree": "63a2fc3d4b454fe673301785c8394add7908bd07", "parents": [ "4472702e6575809c2d232efc09ac25caf66b395d" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jun 08 08:20:59 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 18:18:33 2010 -0700" }, "message": "usbnet: Print device statistics as unsigned\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "62522d36d74a843e78d17f2dffc90468c6762803", "tree": "d9d21de6724425c1b0ba12991e0865556aeda6b4", "parents": [ "a71fba97295db924c0b90266e9833e5059fead24", "e79aa8671033535c2e9ffc0a68010ae49ed5734c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:32:31 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 13:32:31 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "9227a46bfbac0516fb7428715a095e1bc59b872a", "tree": "2306b6f10f51a14b815af079b35bcc5eadd003fb", "parents": [ "024a07bacf8287a6ddfa83e9d5b951c5e8b4070e" ], "author": { "name": "Jussi Kivilinna", "email": "jussi.kivilinna@mbnet.fi", "time": "Mon Jun 07 00:56:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 00:56:27 2010 -0700" }, "message": "asix: check packet size against mtu+ETH_HLEN instead of ETH_FRAME_LEN\n\nDriver checks received packet is too large in asix_rx_fixup() and fails if it is. Problem is\nthat MTU might be set larger than 1500 and asix fails to work correctly with VLAN tagged\npackets. The check should be \u0027dev-\u003enet-\u003emtu + ETH_HLEN\u0027 instead.\n\nTested with AX88772.\n\nSigned-off-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ba2d3587912f82d1ab4367975b1df460db60fb1e", "tree": "1e4e04caf23274bb4e39edbfc5713b4856326953", "parents": [ "1273d97674a1782ff55b823aa6c40aea9b538aaf" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 02 18:10:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 03 03:18:23 2010 -0700" }, "message": "drivers/net: use __packed annotation\n\ncleanup patch.\n\nUse new __packed annotation in drivers/net/\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f925b1303e0672effc78547353bd2ddfe11f5b5f", "tree": "ef5e4e19aa70fcf08d624fec1d5cc9a342c12136", "parents": [ "dd131e76e562fa0c6f9dd53130e8d08d39a0b62c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 16:24:03 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 16:24:03 2010 -0700" }, "message": "drivers/net/usb/asix.c: Fix pointer cast.\n\nStephen Rothwell reports the following new warning:\n\ndrivers/net/usb/asix.c: In function \u0027asix_rx_fixup\u0027:\ndrivers/net/usb/asix.c:325: warning: cast from pointer to integer of different size\ndrivers/net/usb/asix.c:354: warning: cast from pointer to integer of different size\n\nThe code just cares about the low alignment bits, so use\nan \"unsigned long\" cast instead of one to \"u32\".\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dd7496f217462a23a9a8a15b9925866eaad76e22", "tree": "568d8af795cc68bf306dd867317c7b6960ac378f", "parents": [ "e513480e28cdfd868755f05c1a654fcfcee58070" ], "author": { "name": "Filip Aben", "email": "f.aben@option.com", "time": "Tue May 25 16:09:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 16:09:23 2010 -0700" }, "message": "hso: add support for new products\n\nThis patch adds a few new product id\u0027s for the hso driver.\n\nSigned-off-by: Filip Aben \u003cf.aben@option.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7a9b149212f3716c598afe973b6261fd58453b7a", "tree": "477716d84c71da124448b72278e98da28aadbd3d", "parents": [ "3d62e3fdce8ef265a3706c52ae1ca6ab84e30f0e", "e26bcf37234c67624f62d9fc95f922b8dbda1363" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:26:12 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 21:26:12 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)\n USB: remove unused usb_buffer_alloc and usb_buffer_free macros\n usb: musb: update gfp/slab.h includes\n USB: ftdi_sio: fix legacy SIO-device header\n USB: kl5usb105: reimplement using generic framework\n USB: kl5usb105: minor clean ups\n USB: kl5usb105: fix memory leak\n USB: io_ti: use kfifo to implement write buffering\n USB: io_ti: remove unsused private counter\n USB: ti_usb: use kfifo to implement write buffering\n USB: ir-usb: fix incorrect write-buffer length\n USB: aircable: fix incorrect write-buffer length\n USB: safe_serial: straighten out read processing\n USB: safe_serial: reimplement read using generic framework\n USB: safe_serial: reimplement write using generic framework\n usb-storage: always print quirks\n USB: usb-storage: trivial debug improvements\n USB: oti6858: use port write fifo\n USB: oti6858: use kfifo to implement write buffering\n USB: cypress_m8: use kfifo to implement write buffering\n USB: cypress_m8: remove unused drain define\n ...\n\nFix up conflicts (due to usb_buffer_alloc/free renaming) in\n\tdrivers/input/tablet/acecad.c\n\tdrivers/input/tablet/kbtab.c\n\tdrivers/input/tablet/wacom_sys.c\n\tdrivers/media/video/gspca/gspca.c\n\tsound/usb/usbaudio.c\n" }, { "commit": "997ea58eb92f9970b8af7aae48800d0ef43b9423", "tree": "65e021973e5a48ad7290d5be1f441940566468ad", "parents": [ "48679c6d772b1459a2945729e3a1256ac78fcabf" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Mon Apr 12 13:17:25 2010 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu May 20 13:21:38 2010 -0700" }, "message": "USB: rename usb_buffer_alloc() and usb_buffer_free() users\n\nFor more clearance what the functions actually do,\n\n usb_buffer_alloc() is renamed to usb_alloc_coherent()\n usb_buffer_free() is renamed to usb_free_coherent()\n\nThey should only be used in code which really needs DMA coherency.\n\nAll call sites have been changed accordingly, except for staging\ndrivers.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: Pedro Ribeiro \u003cpedrib@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "95718c1c25370b2c85061a4d8dfab2831b3ad280", "tree": "5cbaed49a44a44ffaa73c9e168946ae4f547e1f5", "parents": [ "56e6943b902562e09d3e74126d8d8256b5ea17fb" ], "author": { "name": "Tadashi Abe", "email": "tabe@mvista.com", "time": "Mon May 17 22:41:45 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 22:41:45 2010 -0700" }, "message": "pegasus: fix USB device ID for ETX-US2\n\nUSB device ID definition for I-O Data ETX-US2 is wrong.\nCorrect ID is 0x093a. Here\u0027s snippet from /proc/bus/usb/devices;\n\nT: Bus\u003d01 Lev\u003d01 Prnt\u003d01 Port\u003d01 Cnt\u003d01 Dev#\u003d 2 Spd\u003d480 MxCh\u003d 0\nD: Ver\u003d 2.00 Cls\u003dff(vend.) Sub\u003dff Prot\u003d00 MxPS\u003d64 #Cfgs\u003d 1\nP: Vendor\u003d04bb ProdID\u003d093a Rev\u003d 1.01\nS: Manufacturer\u003dI-O DATA DEVICE,INC.\nS: Product\u003dI-O DATA ETX2-US2\nS: SerialNumber\u003dA26427\nC:* #Ifs\u003d 1 Cfg#\u003d 1 Atr\u003d80 MxPwr\u003d224mA\nI:* If#\u003d 0 Alt\u003d 0 #EPs\u003d 3 Cls\u003dff(vend.) Sub\u003dff Prot\u003d00 Driver\u003dpegasus\nE: Ad\u003d81(I) Atr\u003d02(Bulk) MxPS\u003d 512 Ivl\u003d0ms\nE: Ad\u003d02(O) Atr\u003d02(Bulk) MxPS\u003d 512 Ivl\u003d0ms\nE: Ad\u003d83(I) Atr\u003d03(Int.) MxPS\u003d 8 Ivl\u003d125us\n\nThis patch enables pegasus driver to work fine with ETX-US2.\n\nSigned-off-by: Tadashi Abe \u003ctabe@mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5476b8b22589fe118f3c228d71406455002b79b1", "tree": "01a42f9d6949f9bf2b97a5ca667ad67842eee797", "parents": [ "99bf236612801351834b441314379bc5304d62ce" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sat May 15 11:23:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:44:48 2010 -0700" }, "message": "drivers/net/usb: Use kmemdup\n\nUse kmemdup when some other buffer is immediately copied into the\nallocated region.\n\nA simplified version of the semantic patch that makes this change is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression from,to,size,flag;\nstatement S;\n@@\n\n- to \u003d \\(kmalloc\\|kzalloc\\)(size,flag);\n+ to \u003d kmemdup(from,size,flag);\n if (to\u003d\u003dNULL || ...) S\n- memcpy(to, from, size);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99bf236612801351834b441314379bc5304d62ce", "tree": "56922d148dedd5d6fc19e6da0629d6f2dfcec007", "parents": [ "175c04414106c34f0130d8d3bf152825b4829ceb" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sat May 15 11:20:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:44:47 2010 -0700" }, "message": "drivers/net/usb: Use kmemdup\n\nUse kmemdup when some other buffer is immediately copied into the\nallocated region.\n\nA simplified version of the semantic patch that makes this change is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression from,to,size,flag;\nstatement S;\n@@\n\n- to \u003d \\(kmalloc\\|kzalloc\\)(size,flag);\n+ to \u003d kmemdup(from,size,flag);\n if (to\u003d\u003dNULL || ...) S\n- memcpy(to, from, size);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "175c04414106c34f0130d8d3bf152825b4829ceb", "tree": "e75156f45768c01199fb270445dcbdf37d005b16", "parents": [ "08d18f3b62b4c05731a09eca2b432842a0a18da5" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sat May 15 11:18:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:44:47 2010 -0700" }, "message": "drivers/net/usb: Use kmemdup\n\nUse kmemdup when some other buffer is immediately copied into the\nallocated region.\n\nA simplified version of the semantic patch that makes this change is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@\nexpression from,to,size,flag;\nstatement S;\n@@\n\n- to \u003d \\(kmalloc\\|kzalloc\\)(size,flag);\n+ to \u003d kmemdup(from,size,flag);\n if (to\u003d\u003dNULL || ...) S\n- memcpy(to, from, size);\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f78d1f210ff89af77f042ab7f4a8fee39feb1c9", "tree": "f29742a1a73c27a88c7ac701a7a06ac1c2f7973a", "parents": [ "e7a3af5d8cd782b84e6ca4e4dcc8613be1a809f0" ], "author": { "name": "Neil Jones", "email": "NeilJay@gmail.com", "time": "Mon May 17 17:18:28 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 17:18:28 2010 -0700" }, "message": "drivers/net/usb/asix.c: Fix unaligned accesses\n\nUsing this driver can cause unaligned accesses in the IP layer\nThis has been fixed by aligning the skb data correctly using the\nspare room left over by the 4 byte header inserted between packets\nby the device.\n\nSigned-off-by: Neil Jones \u003cNeilJay@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c17b274dc2aa538b68c1f02b01a3c4e124b435ba", "tree": "adba02f37f287b01daedbe8d5399fc2cc065fde0", "parents": [ "83827f6a891e20de7468b1181f2ae8a3cc72587b" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Sat May 15 23:03:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 15 23:03:29 2010 -0700" }, "message": "rndis_host: Poll status channel before control channel\n\nSome RNDIS devices don\u0027t respond on the control channel until polled\non the status channel. In particular, this was reported to be the\ncase for the 2Wire HomePortal 1000SW.\n\nThis is roughly based on a patch by John Carr \u003cjohn.carr@unrouted.co.uk\u003e\nwhich is reported to be needed for use with some Windows Mobile devices\nand which is currently applied by Mandriva.\n\nReported-by: Mark Glassberg \u003cvzeeaxwl@myfairpoint.net\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nTested-by: Mark Glassberg \u003cvzeeaxwl@myfairpoint.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a4b770972b8f819e408d7cc3ae9637e15bff62f6", "tree": "62e3c413b084c106d750cf6cc0701709cde30100", "parents": [ "21ce849ba5cc178740c6532ba3dded852296ad91" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri May 14 00:19:28 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 14 00:19:28 2010 -0700" }, "message": "drivers/net: Remove unnecessary returns from void function()s\n\nThis patch removes from drivers/net/ all the unnecessary\nreturn; statements that precede the last closing brace of\nvoid functions.\n\nIt does not remove the returns that are immediately\npreceded by a label as gcc doesn\u0027t like that.\n\nIt also does not remove null void functions with return.\n\nDone via:\n$ grep -rP --include\u003d*.[ch] -l \"return;\\n}\" net/ | \\\n xargs perl -i -e \u0027local $/ ; while (\u003c\u003e) { s/\\n[ \\t\\n]+return;\\n}/\\n}/g; print; }\u0027\n\nwith some cleanups by hand.\n\nCompile tested x86 allmodconfig only.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1", "tree": "d1955a7639e99832590df26466a34d5786a880ae", "parents": [ "2b0b05ddc04b6d45e71cd36405df512075786f1e" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon May 10 05:01:31 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 10 05:01:31 2010 -0700" }, "message": "net: trans_start cleanups\n\nNow that core network takes care of trans_start updates, dont do it\nin drivers themselves, if possible. Drivers can avoid one cache miss\n(on dev-\u003etrans_start) in their start_xmit() handler.\n\nExceptions are NETIF_F_LLTX drivers\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f7ca5917e989c4f77db3e97f92badaf3266d4dc", "tree": "0f29c4d45870c7d6317ff768c751aebf0948098a", "parents": [ "a2f3be17c07ad9bd45ab300f79642ecb39cfb553", "d05070091849015f8c5b7d55cd75b86ebb61b3ec" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 15:45:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 15:45:52 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "e9162ab1610531d6ea6c1833daeb2613e44275e8", "tree": "344f7b49cbf7cbe3b61de4f18362d286226b4d4c", "parents": [ "19937d0482cfe194fe52e97e59aa58ec911de0d1" ], "author": { "name": "Peter Korsgaard", "email": "jacmet@sunsite.dk", "time": "Mon May 03 10:01:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 03 15:26:30 2010 -0700" }, "message": "dm9601: fix phy/eeprom write routine\n\nUse correct bit positions in DM_SHARED_CTRL register for writes.\n\nMichael Planes recently encountered a \u0027KY-RS9600 USB-LAN converter\u0027, which\ncame with a driver CD containing a Linux driver. This driver turns out to\nbe a copy of dm9601.c with symbols renamed and my copyright stripped.\nThat aside, it did contain 1 functional change in dm_write_shared_word(),\nand after checking the datasheet the original value was indeed wrong\n(read versus write bits).\n\nOn Michaels HW, this change bumps receive speed from ~30KB/s to ~900KB/s.\nOn other devices the difference is less spectacular, but still significant\n(~30%).\n\nReported-by: Michael Planes \u003cmichael.planes@free.fr\u003e\nCC: stable@kernel.org\nSigned-off-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ef527377b88ff05fb122a47619ea506c631c914", "tree": "2c2e774527d5f591b975834f43e8c6fd12fb38f2", "parents": [ "47d29646a2c1c147d8a7598aeac2c87dd71ed638", "1183f3838c588545592c042c0ce15015661ce7f2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 02 21:43:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 02 22:02:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "6f1464bf65fcaa57a4b32dae93de4e8bbdfaf7c5", "tree": "8ae235ac689a54ca60ae13042b6c7d9fc5e8c6a4", "parents": [ "2fdc45c7c4c283bc6882de20d2d887dc3bfdd899" ], "author": { "name": "Elina Pasheva", "email": "epasheva@sierrawireless.com", "time": "Wed Apr 28 13:28:24 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 01 18:07:46 2010 -0700" }, "message": "net/usb: initiate sync sequence in sierra_net.c driver\n\nThe following patch adds the initiation of the sync sequence to\n\"sierra_net_bind()\". If this step is omitted, the modem will never sync up\nwith the host and it will not be possible to establish a data connection.\n\nSigned-off-by: Elina Pasheva \u003cepasheva@sierrawireless.com\u003e\nSigned-off-by: Rory Filer \u003crfiler@sierrawireless.com\u003e\nTested-by: Elina Pasheva \u003cepasheva@sierrawireless.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2fdc45c7c4c283bc6882de20d2d887dc3bfdd899", "tree": "a3549bed896739e45ba2ba485ebe369da405a1c6", "parents": [ "6c3b9d3458a8272f1e4c6aed9e8325136f6380f9" ], "author": { "name": "Elina Pasheva", "email": "epasheva@sierrawireless.com", "time": "Fri Apr 30 19:05:28 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 30 19:05:28 2010 -0700" }, "message": "net/usb: remove default in Kconfig for sierra_net driver\n\nThe following patch removes the default from the Kconfig entry for sierra_net\ndriver as recommended.\n\nSigned-off-by: Elina Pasheva \u003cepasheva@sierrawireless.com\u003e\nSigned-off-by: Rory Filer \u003crfiler@sierrawireless.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "21851264120b0bd1f953328cb131abcfa9305bc3", "tree": "0c2e2cb447f51508aa50bdd738b93b91a298a790", "parents": [ "81a2e36df7de8bf9417de67f9d54b4f740072ed0" ], "author": { "name": "Jonas Sjöquist", "email": "jonas.sjoquist@ericsson.com", "time": "Fri Apr 23 01:07:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 30 16:27:36 2010 -0700" }, "message": "cdc_ether: Identify MBM devices by GUID in MDLM descriptor\n\nThis patch removes vid/pid for Ericsson MBM devices from the whitelist set of\ndevices. The MBM devices are instead identified by GUID.\n\nIn order for cdc_ether to handle these devices the GUID in the MDLM descriptor\nis tested. All MBM devices currently handled by cdc_ether as well as future\nCDC Ethernet MBM devices can be identified by the GUID.\n\nThis is the same solution used in Carl Nordbeck\u0027s mbm driver,\nhttp://kerneltrap.org/mailarchive/linux-usb/2008/11/17/4141384/thread\n\nI post this as RFC to get feedback on however cdc_ether is the correct place to\ndo the binding, or if it should be done in a separate driver, e.g. zaurus.\n\nSigned-off-by: Jonas Sjöquist \u003cjonas.sjoquist@ericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb4fd8cd355c8ec425a12ec6cbdac614e8a4819d", "tree": "f56ccf5063b6c703351880c11694a6fb5ece4590", "parents": [ "55964d72d63b15df49a5df11ef91dc8601270815" ], "author": { "name": "Elina Pasheva", "email": "epasheva@sierrawireless.com", "time": "Tue Apr 27 18:06:41 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 18:12:04 2010 -0700" }, "message": "net/usb: add sierra_net.c driver\n\nRe-submitted based on comments from netdev community.\nSummary of the changes:\n1. Improved error handling.\n2. Added the missing timeout arguments to usb_control_msg().\n\nThe following is a new Linux driver which exposes certain models of Sierra\nWireless modems to the operating system as Network Interface Cards (NICs).\n\nThis driver requires a version of the sierra.c driver which supports\nblacklisting to work properly. The blacklist in sierra.c rejects the interfaces\nclaimed by sierra_net.c. Likewise, the sierra_net.c driver only accepts\n(i.e. whitelists) the interface(s) used for USB-to-WWAN traffic.\nThe version of sierra.c which supports blacklisting is\navailable from the sierra wireless knowledge base page for older kernels. It is\nalso available in Linux kernel starting from version 2.6.31.\n\nThis driver works with all Sierra Wireless devices configured with PID\u003d68A3\nlike USB305, USB306 provided the corresponding firmware version is I2.0\n(for USB305) or M3.0 (for USB306) and later.\nThis driver will not work with earlier firmware versions than the ones shown\nabove. In this case the driver will issue an error message indicating\nincompatibility and will not serve the device\u0027s USB-to-WWAN interface.\n\nSierra_net.c sits atop a pre-existing Linux driver called usbnet.c.\nA series of hook functions are provided in sierra_net.c which are called by\nusbnet.c in response to a particular condition such as receipt or transmission\nof a data packet. As such, usbnet.c does most of the work of making\na modem appear to the system as a network device and for properly exchanging\ntraffic between the USB subsystem and the Network card interface.\nSierra_net.c is concerned with managing the data exchanged between the\nUSB-to-WWAN interface and the upper layers of the operating system.\n\nSigned-off-by: Elina Pasheva \u003cepasheva@sierrawireless.com\u003e\nSigned-off-by: Rory Filer \u003crfiler@sierrawireless.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55964d72d63b15df49a5df11ef91dc8601270815", "tree": "69f78c30a50d0575b18b4f11646ffc7411c0f14d", "parents": [ "477fffb082920476cc26f238d65538ccb8d601e1" ], "author": { "name": "Torgny Johansson", "email": "torgny.johansson@ericsson.com", "time": "Tue Apr 27 17:07:40 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 17:07:40 2010 -0700" }, "message": "cdc_ether: fix autosuspend for mbm devices\n\nAutosuspend works until you bring the wwan interface up, then the\ndevice does not enter autosuspend anymore.\n\nThe following patch fixes the problem by setting the .manage_power\nfield in the mbm_info struct to the same as in the cdc_info struct\n(cdc_manager_power).\n\nSigned-off-by: Torgny Johansson \u003ctorgny.johansson@ericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d87ff58fda926fe5cb01214cccf1c72422ac776d", "tree": "896ae06e804c24fd02b254896a884d2f5d30fe4a", "parents": [ "2a9151572224ad5fe808058097be94106470a6dc" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Apr 26 23:20:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 14:49:07 2010 -0700" }, "message": "ipheth: potential null dereferences on error path\n\nThe calls to usb_free_buffer() dereference rx_urb and tx_urb in the\nparameter list but those could be NULL.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: L. Alberto Giménez \u003cagimenez@sysvalve.es\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dacf4fc85bbd063b8108b6c21275ae4a4fcce908", "tree": "72f0892ef0d4128b835431a28ffec8a3091aeae5", "parents": [ "587611d6e4d5c0fb5e9492cb06d9054744d69536" ], "author": { "name": "Andreas Hartmann", "email": "andi@ahash.de", "time": "Tue Apr 27 14:39:33 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 14:39:33 2010 -0700" }, "message": "drivers/usb/net/kaweth.c: add device \"Allied Telesyn AT-USB10 USB Ethernet Adapter\"\n\nakpm: reluctantly typed in from\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d15599\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1703b36c358dde24ececba4fd609ecd91433ba3", "tree": "d59c333d0ad5bf72f165264eba6048c87fdc4e0f", "parents": [ "7ec75c582e639d956ce3afd499f67febe6f902a4", "e95ef5d3f6bc60433883e1ef65dac747acd0bf1a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:49:13 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 27 12:49:13 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/e100.c\n\tdrivers/net/e1000e/netdev.c\n" } ], "next": "a19259c3d589a014e5f47f148f74dfc44422c82b" }