)]}' { "log": [ { "commit": "516bd664153d76f5c814633cee6500e2ff8e861b", "tree": "f67a1c70b013961849d3491ef22596cd0b0d9af9", "parents": [ "844b9a8707f1fcf0482e0c52f44a555e799ccda6", "573201f36fd9c7c6d5218cdcd9948cee700b277d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:26:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 20 16:26:42 2010 -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: (24 commits)\n bridge: Partially disable netpoll support\n tcp: fix crash in tcp_xmit_retransmit_queue\n IPv6: fix CoA check in RH2 input handler (mip6_rthdr_input())\n ibmveth: lost IRQ while closing/opening device leads to service loss\n rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()\n vhost: avoid pr_err on condition guest can trigger\n ipmr: Don\u0027t leak memory if fib lookup fails.\n vhost-net: avoid flush under lock\n net: fix problem in reading sock TX queue\n net/core: neighbour update Oops\n net: skb_tx_hash() fix relative to skb_orphan_try()\n rfs: call sock_rps_record_flow() in tcp_splice_read()\n xfrm: do not assume that template resolving always returns xfrms\n hostap_pci: set dev-\u003ebase_addr during probe\n axnet_cs: use spin_lock_irqsave in ax_interrupt\n dsa: Fix Kconfig dependencies.\n act_nat: not all of the ICMP packets need an IP header payload\n r8169: incorrect identifier for a 8168dp\n Phonet: fix skb leak in pipe endpoint accept()\n Bluetooth: Update sec_level/auth_type for already existing connections\n ...\n" }, { "commit": "b508998f665ee6d6a15eae11be258c3e94c33562", "tree": "4233f82d716e97a874a206f6337959334286d448", "parents": [ "d9a9dc66eb8a8fd85c8546247e7e1d6023d0eb0f", "9acd56d3f2a05191ee369cbdd8c37dd547aa19b8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 12:38:51 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 19 12:38:51 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "ee2e6114de3bdb1c34f3910b690f990483e981ab", "tree": "a6b4de8355b31824103e24dc81bc0515c08d99b0", "parents": [ "0f6142fa96a4ce799ccaa4cdb38fc4a715eb9d35" ], "author": { "name": "Robert Jennings", "email": "rcj@linux.vnet.ibm.com", "time": "Fri Jul 16 04:57:25 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 16 13:03:23 2010 -0700" }, "message": "ibmveth: lost IRQ while closing/opening device leads to service loss\n\nThe order of freeing the IRQ and freeing the device in firmware\nin ibmveth_close can cause the adapter to become unusable after a\nsubsequent ibmveth_open. Only a reboot of the OS will make the\nnetwork device usable again. This is seen when cycling the adapter\nup and down while there is network activity.\n\nThere is a window where an IRQ will be left unserviced (H_EOI will not\nbe called). The solution is to make a VIO_IRQ_DISABLE h_call, free the\ndevice with firmware, and then call free_irq.\n\nSigned-off-by: Robert Jennings \u003crcj@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9acd56d3f2a05191ee369cbdd8c37dd547aa19b8", "tree": "8be52da7dc7d8e70e4d3fd9302986c2f51ba1cfa", "parents": [ "0f4da2d77e1bf424ac36424081afc22cbfc3ff2b" ], "author": { "name": "Stephen Boyd", "email": "bebarino@gmail.com", "time": "Fri Jul 16 09:50:10 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jul 16 13:57:59 2010 -0400" }, "message": "rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()\n\nThe rt2x00dev-\u003eintf_work workqueue is never initialized when a driver is\nprobed for a non-existent device (in this case rt2500usb). On such a\npath we call rt2x00lib_remove_dev() to free any resources initialized\nduring the probe before we use INIT_WORK to initialize the workqueue.\nThis causes lockdep to get confused since the lock used in the workqueue\nhasn\u0027t been initialized yet but is now being acquired during\ncancel_work_sync() called by rt2x00lib_remove_dev().\n\nFix this by initializing the workqueue first before we attempt to probe\nthe device. This should make lockdep happy and avoid breaking any\nassumptions about how the library cleans up after a probe fails.\n\nphy0 -\u003e rt2x00lib_probe_dev: Error - Failed to allocate device.\nINFO: trying to register non-static key.\nthe code is fine but needs lockdep annotation.\nturning off the locking correctness validator.\nPid: 2027, comm: modprobe Not tainted 2.6.35-rc5+ #60\nCall Trace:\n [\u003cffffffff8105fe59\u003e] register_lock_class+0x152/0x31f\n [\u003cffffffff81344a00\u003e] ? usb_control_msg+0xd5/0x111\n [\u003cffffffff81061bde\u003e] __lock_acquire+0xce/0xcf4\n [\u003cffffffff8105f6fd\u003e] ? trace_hardirqs_off+0xd/0xf\n [\u003cffffffff81492aef\u003e] ? _raw_spin_unlock_irqrestore+0x33/0x41\n [\u003cffffffff810628d5\u003e] lock_acquire+0xd1/0xf7\n [\u003cffffffff8104f037\u003e] ? __cancel_work_timer+0x99/0x17e\n [\u003cffffffff8104f06e\u003e] __cancel_work_timer+0xd0/0x17e\n [\u003cffffffff8104f037\u003e] ? __cancel_work_timer+0x99/0x17e\n [\u003cffffffff8104f136\u003e] cancel_work_sync+0xb/0xd\n [\u003cffffffffa0096675\u003e] rt2x00lib_remove_dev+0x25/0xb0 [rt2x00lib]\n [\u003cffffffffa0096bf7\u003e] rt2x00lib_probe_dev+0x380/0x3ed [rt2x00lib]\n [\u003cffffffff811d78a7\u003e] ? __raw_spin_lock_init+0x31/0x52\n [\u003cffffffffa00bbd2c\u003e] ? T.676+0xe/0x10 [rt2x00usb]\n [\u003cffffffffa00bbe4f\u003e] rt2x00usb_probe+0x121/0x15e [rt2x00usb]\n [\u003cffffffff813468bd\u003e] usb_probe_interface+0x151/0x19e\n [\u003cffffffff812ea08e\u003e] driver_probe_device+0xa7/0x136\n [\u003cffffffff812ea167\u003e] __driver_attach+0x4a/0x66\n [\u003cffffffff812ea11d\u003e] ? __driver_attach+0x0/0x66\n [\u003cffffffff812e96ca\u003e] bus_for_each_dev+0x54/0x89\n [\u003cffffffff812e9efd\u003e] driver_attach+0x19/0x1b\n [\u003cffffffff812e9b64\u003e] bus_add_driver+0xb4/0x204\n [\u003cffffffff812ea41b\u003e] driver_register+0x98/0x109\n [\u003cffffffff813465dd\u003e] usb_register_driver+0xb2/0x173\n [\u003cffffffffa00ca000\u003e] ? rt2500usb_init+0x0/0x20 [rt2500usb]\n [\u003cffffffffa00ca01e\u003e] rt2500usb_init+0x1e/0x20 [rt2500usb]\n [\u003cffffffff81000203\u003e] do_one_initcall+0x6d/0x17a\n [\u003cffffffff8106cae8\u003e] sys_init_module+0x9c/0x1e0\n [\u003cffffffff8100296b\u003e] system_call_fastpath+0x16/0x1b\n\nSigned-off-by: Stephen Boyd \u003cbebarino@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0f4da2d77e1bf424ac36424081afc22cbfc3ff2b", "tree": "04e40fdb0513f18642c8d20499d207ff1b297b81", "parents": [ "f8036965ccec4d786d8bf09bf57b793542cb3dce" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 13 14:06:32 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 14 13:49:46 2010 -0400" }, "message": "hostap_pci: set dev-\u003ebase_addr during probe\n\n\"hostap: Protect against initialization interrupt\" (which reinstated\n\"wireless: hostap, fix oops due to early probing interrupt\")\nreintroduced Bug 16111. This is because hostap_pci wasn\u0027t setting\ndev-\u003ebase_addr, which is now checked in prism2_interrupt. As a result,\ninitialization was failing for PCI-based hostap devices. This corrects\nthat oversight.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ab83a38958ae7e419f18fabe9b2954a6087bfe0d", "tree": "8d12915d385d55c9cef5c0a878eb9ff6da5a8934", "parents": [ "336a283b9cbe47748ccd68fd8c5158f67cee644b" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Jul 10 01:18:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:13:02 2010 -0700" }, "message": "axnet_cs: use spin_lock_irqsave in ax_interrupt\n\nUse spin_lock_irqsave instead of spin_lock in ax_interrupt because\nthe interrupt handler can also be invoked from ei_watchdog.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c4363d6acd8d2ec9156f6469c742351e5d122489", "tree": "4adeb202ec1eb1ca08749e7073c82f7bdb5960ab", "parents": [ "17c99297212a2d1b1779a08caf4b0d83a85545df", "f8036965ccec4d786d8bf09bf57b793542cb3dce" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 15:17:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 15:17:29 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "17c99297212a2d1b1779a08caf4b0d83a85545df", "tree": "496026bacfea9163c0733eb93b7230ce1a73005a", "parents": [ "635f081541edef7644073f9be50ee5bf7c57ce63" ], "author": { "name": "Francois Romieu", "email": "romieu@fr.zoreil.com", "time": "Sun Jul 11 17:10:09 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 11 17:10:09 2010 -0700" }, "message": "r8169: incorrect identifier for a 8168dp\n\nMerge error.\n\nSee CFG_METHOD_8 (0x3c800000 + 0x00300000) since version 8.002.00\nof Realtek\u0027s driver.\n\nSigned-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nCc: Hayes \u003chayeswang@realtek.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2aa72f612144a0a7d4b0b22ae7c122692ac6a013", "tree": "8af2d2ac975887a04b4e4109de3d785f7046979b", "parents": [ "78178c7d6e127fff6dba027315fd6914304b05cf", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 19:56:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 07 19:56:00 2010 -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: (35 commits)\n NET: SB1250: Initialize .owner\n vxge: show startup message with KERN_INFO\n ll_temac: Fix missing iounmaps\n bridge: Clear IPCB before possible entry into IP stack\n bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference\n net: Fix definition of netif_vdbg() when VERBOSE_DEBUG is defined\n net/ne: fix memory leak in ne_drv_probe()\n xfrm: fix xfrm by MARK logic\n virtio_net: fix oom handling on tx\n virtio_net: do not reschedule rx refill forever\n s2io: resolve statistics issues\n linux/net.h: fix kernel-doc warnings\n net: decreasing real_num_tx_queues needs to flush qdisc\n sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock\n qlge: fix a eeh handler to not add a pending timer\n qlge: Replacing add_timer() to mod_timer()\n usbnet: Set parent device early for netdev_printk()\n net: Revert \"rndis_host: Poll status channel before control channel\"\n netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT\n drivers: bluetooth: bluecard_cs.c: Fixed include error, changed to linux/io.h\n ...\n" }, { "commit": "33b665eeeb85956ccbdf31c4c31a4e2a31133c44", "tree": "b6a7f44914da72378a0e2ddc6186b20728978b43", "parents": [ "7074b16cc6bd27b1962e8f592b3733ebe92f4897" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Tue Jul 06 05:18:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:00:49 2010 -0700" }, "message": "NET: SB1250: Initialize .owner\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n drivers/net/sb1250-mac.c | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7074b16cc6bd27b1962e8f592b3733ebe92f4897", "tree": "05f8cbceb5efd04630780eec79a3b6e4ad2a9970", "parents": [ "dfe1e8eddcd73fc58124933c14c2efe93fab0b8f" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Tue Jul 06 03:02:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 14:52:24 2010 -0700" }, "message": "vxge: show startup message with KERN_INFO\n\nThe original KERN_CRIT will mess up terminals.\n\nCC: Sreenivasa Honnur \u003cSreenivasa.Honnur@neterion.com\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dfe1e8eddcd73fc58124933c14c2efe93fab0b8f", "tree": "65dc2eaa9097c2dbfc4225071c00c2949a7a85ce", "parents": [ "17762060c25590bfddd68cc1131f28ec720f405f" ], "author": { "name": "Denis Kirjanov", "email": "dkirjanov@kernel.org", "time": "Mon Jul 05 21:44:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 14:48:00 2010 -0700" }, "message": "ll_temac: Fix missing iounmaps\n\nFix missing iounmaps.\n\nSigned-off-by: Denis Kirjanov \u003cdkirjanov@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f8036965ccec4d786d8bf09bf57b793542cb3dce", "tree": "9e919d26118e07433009438dbd29f69163ff9e59", "parents": [ "e4c064728ca358622918fa69ab2bb05f5a2090a8" ], "author": { "name": "Rajkumar Manoharan", "email": "rmanoharan@atheros.com", "time": "Wed Jul 07 15:19:18 2010 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 07 15:39:07 2010 -0400" }, "message": "ath9k_htc: fix memory leak in ath9k_hif_usb_alloc_urbs\n\nFailure cases within ath9k_hif_usb_alloc_urbs are failed\nto release allocated memory.\n\nSigned-off-by: Rajkumar Manoharan \u003crmanoharan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3390712a474abdcd3de10024dd1062e5928d381c", "tree": "1089f92b86d040dbd50a8bb589910e465e152623", "parents": [ "44b451f1633896de15d2d52e1a2bd462e80b7814" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Sat Jul 03 05:20:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 05 20:08:05 2010 -0700" }, "message": "net/ne: fix memory leak in ne_drv_probe()\n\nnet_device allocated with alloc_eip_netdev() must be freed.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "58eba97d0774c69b1cf3e5a8ac74419409d1abbf", "tree": "985ad7b05c0b4952ff76f83dfab87f18466ebe4f", "parents": [ "1788f49548860fa1c861ee3454d47b466c877e43" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 02 16:34:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:27:26 2010 -0700" }, "message": "virtio_net: fix oom handling on tx\n\nvirtio net will never try to overflow the TX ring, so the only reason\nadd_buf may fail is out of memory. Thus, we can not stop the\ndevice until some request completes - there\u0027s no guarantee anything\nat all is outstanding.\n\nMake the error message clearer as well: error here does not\nindicate queue full.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e (...and avoid TX_BUSY)\nCc: stable@kernel.org # .34.x (s/virtqueue_/vi-\u003esvq-\u003evq_ops-\u003e/)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1788f49548860fa1c861ee3454d47b466c877e43", "tree": "fa1b0633814188f942441eaa5a89dd504faae819", "parents": [ "4a49043223e5047c8f60a09f7b2927a2e6e8dfc7" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri Jul 02 16:32:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:27:25 2010 -0700" }, "message": "virtio_net: do not reschedule rx refill forever\n\nWe currently fill all of RX ring, then add_buf\nreturns ENOSPC, which gets mis-detected as an out of\nmemory condition and causes us to reschedule the work,\nand so on forever. Fix this by oom \u003d err \u003d\u003d -ENOMEM;\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: stable@kernel.org # .34.x\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4a49043223e5047c8f60a09f7b2927a2e6e8dfc7", "tree": "6e11ebe97981668ba06d538c44dc7c09a6c688a9", "parents": [ "94e6721d9ce938293a02736c5f7e42205a41ea68" ], "author": { "name": "Jon Mason", "email": "jon.mason@exar.com", "time": "Fri Jul 02 09:13:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:27:25 2010 -0700" }, "message": "s2io: resolve statistics issues\n\nThis patch resolves a number of issues in the statistics gathering of\nthe s2io driver.\n\nOn Xframe adapters, the received multicast statistics counter includes\npause frames which are not indicated to the driver. This can cause\nissues where the multicast packet count is higher than what has actually\nbeen received, possibly higher than the number of packets received.\n\nThe driver software counters are replaced with the adapter hardware\nstatistics for rx_packets, rx_bytes, and tx_bytes. It also uses the\noverflow registers to determine if the statistics wrapped the 32bit\nregister (removing the window of having a statistic value less than the\nprevious call). rx_length_errors statistic now includes undersized\npackets in addition to oversized packets in its counting. Finally,\nrx_crc_errors are now being counted.\n\nSigned-off-by: Jon Mason \u003cjon.mason@exar.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f0796d5c73e59786d09a1e617689d1d415f2db44", "tree": "ecb17c65c5b6a162824a1e11fee24364852837f8", "parents": [ "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "net: decreasing real_num_tx_queues needs to flush qdisc\n\nReducing real_num_queues needs to flush the qdisc otherwise\nskbs with queue_mappings greater then real_num_tx_queues can\nbe sent to the underlying driver.\n\nThe flow for this is,\n\ndev_queue_xmit()\n\tdev_pick_tx()\n\t\tskb_tx_hash() \u003d\u003e hash using real_num_tx_queues\n\t\tskb_set_queue_mapping()\n\t...\n\tqdisc_enqueue_root() \u003d\u003e enqueue skb on txq from hash\n...\ndev-\u003ereal_num_tx_queues -\u003d n\n...\nsch_direct_xmit()\n\tdev_hard_start_xmit()\n\t\tndo_start_xmit(skb,dev) \u003d\u003e skb queue set with old hash\n\nskbs are enqueued on the qdisc with skb-\u003equeue_mapping set\n0 \u003c queue_mappings \u003c real_num_tx_queues. When the driver\ndecreases real_num_tx_queues skb\u0027s may be dequeued from the\nqdisc with a queue_mapping greater then real_num_tx_queues.\n\nThis fixes a case in ixgbe where this was occurring with DCB\nand FCoE. Because the driver is using queue_mapping to map\nskbs to tx descriptor rings we can potentially map skbs to\nrings that no longer exist.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ae80abdba0644e12ac17da567a2db1efc1bf8a8", "tree": "f7e71b7a6c0383e982e02c0b74adb16f36263006", "parents": [ "72046d84f0d6e3047f4d5a5173260141983b2b61" ], "author": { "name": "Breno Leitao", "email": "leitao@linux.vnet.ibm.com", "time": "Thu Jul 01 03:00:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:06 2010 -0700" }, "message": "qlge: fix a eeh handler to not add a pending timer\n\nOn some ocasions the function qlge_io_resume() tries to add a\npending timer, which causes the system to hit the BUG() on\nadd_timer() function.\n\nThis patch removes the timer during the EEH recovery.\n\nSigned-off-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nSigned-off-by: Ron Mercer \u003cron.mercer@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72046d84f0d6e3047f4d5a5173260141983b2b61", "tree": "46e3aba833a5d9944938a18c08e5f5d81c5545ff", "parents": [ "0dacca73a3ddefa6cb8a7e0282f938e01faa1a64" ], "author": { "name": "Breno Leitao", "email": "leitao@linux.vnet.ibm.com", "time": "Thu Jul 01 03:00:17 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:05 2010 -0700" }, "message": "qlge: Replacing add_timer() to mod_timer()\n\nCurrently qlge driver calls add_timer() instead of mod_timer().\nThis patch changes add_timer() to mod_timer(), which seems a better\nsolution.\n\nSigned-off-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nSigned-off-by: Ron Mercer \u003cron.mercer@qlogic.com\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": "e4c064728ca358622918fa69ab2bb05f5a2090a8", "tree": "d1d1f87a660957399ac2c270dea6e5cbb1fb6491", "parents": [ "062bee448bd539580ef9f64efe50fdfe04eeb103" ], "author": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Mon Jun 21 14:23:47 2010 -0700" }, "committer": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Fri Jul 02 10:44:19 2010 -0700" }, "message": "iwlwifi: remove key information during device restart\n\nWhen there is a firmware error or the firmware is reloaded for some other\nreason we currently clear all station information, including keys\nassociated with them. A problem is that we do not clear some other\ninformation regarding keys that are not stored in the station structs.\n\nThe consequence of this is that when the device is reconfigured after the\nfirmware reload we can, among other things, run out of key indices.\n\nThis fixes:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16232\nhttp://bugzilla.intellinuxwireless.org/show_bug.cgi?id\u003d2221\n\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nReviewed-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "42d782ac1bef7cbcdf05b857731345c6e8149f90", "tree": "a832741c37a71797220914f360b454dcca1fff18", "parents": [ "dd1589a431e90f9ff587e640c67101a565e52bba" ], "author": { "name": "Flavio Leitner", "email": "fleitner@redhat.com", "time": "Tue Jun 29 08:24:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:51:11 2010 -0700" }, "message": "bonding: check if clients MAC addr has changed\n\nWhen two systems using bonding devices in adaptive load\nbalancing (ALB) communicates with each other, an endless\nping-pong of ARP replies starts between these two systems.\n\nWhat happens? In the ALB mode, bonding driver keeps track\nof each client connected in a hash table, so it can do the\nreceive load balancing (RLB). This hash table is updated\nwhen an ARP reply is received, then it scans for the client\nentry, updates its MAC address and flag it to be announced\nlater. Therefore, two seconds later, the alb monitor runs\nand send for each updated client entry two ARP replies\nupdating this specific client. The same process happens on\nthe receiving system, causing the endless ping-pong of arp\nreplies.\n\nSee more information including the relevant functions below:\n\n System 1 System 2\n bond0 bond0\n\n ping \u003csystem2\u003e\n ARP request ---------\u003e\n \u003c--------- ARP reply\n\n+-\u003erlb_arp_recv \u003c---------------------+ \u003c--- loop begins\n| rlb_update_entry_from_arp |\n| client_info-\u003entt \u003d 1; |\n| bond_info-\u003erx_ntt \u003d 1; |\n| |\n| \u003ccommunication succeed\u003e |\n| |\n| bond_alb_monitor |\n| rlb_update_rx_clients |\n| rlb_update_client |\n| arp_create(ARPOP_REPLY) |\n| send ARP reply --------------\u003e V\n| send ARP reply --------------\u003e\n| rlb_arp_recv\n| rlb_update_entry_from_arp\n| client_info-\u003entt \u003d 1;\n| bond_info-\u003erx_ntt \u003d 1;\n| \u003c snipped, same as in system 1\u003e\n+------- \u003c-------------- send ARP reply\n \u003c-------------- send ARP reply\n\nBesides the unneeded networking traffic, this loop breaks\na cluster because a backup system can\u0027t take over the IP\naddress. There is always one system sending an ARP reply\npoisoning the network.\n\nThis patch fixes the problem adding a check for the MAC\naddress before updating it. Thus, if the MAC address didn\u0027t\nchange, there is no need to update neither to announce it later.\n\nSigned-off-by: Flavio Leitner \u003cfleitner@redhat.com\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b2c2ff7a1c04e69842254dd4afe0f8ad4efa439", "tree": "705bd91dafd562a38d3833edb30297abf0516459", "parents": [ "08e554b17bfdc2682599c8c2770b088a0187a405" ], "author": { "name": "Saeed Bishara", "email": "saeed@marvell.com", "time": "Sun Jun 27 00:26:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:01:11 2010 -0700" }, "message": "mv643xx_eth: use sw csum for big packets\n\nSome controllers (KW, Dove) limits the TX IP/layer4 checksum offloading to a max size.\n\nSigned-off-by: Saeed Bishara \u003csaeed@marvell.com\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@wantstofly.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "08e554b17bfdc2682599c8c2770b088a0187a405", "tree": "8e986778aaf5c64cf8ba77e02981895ef9cd919b", "parents": [ "4efd7e833591721bec21cc4730a7f6261417840f", "062bee448bd539580ef9f64efe50fdfe04eeb103" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 12:04:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 12:04:58 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "d3ead2413cb99d3e6265577b12537434e229d8c2", "tree": "095cf623549694dd1944f6400d545d02c365a134", "parents": [ "9f756f018a6d9f83556f972ce7fcd6870274efae" ], "author": { "name": "Guillaume Gaudonville", "email": "guillaume.gaudonville@6wind.com", "time": "Tue Jun 29 18:29:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 23:12:41 2010 -0700" }, "message": "ixgbe: skip non IPv4 packets in ATR filter\n\nIn driver ixgbe, ixgbe_atr may cause crashes for non-ipv4 packets. Just\nadd a test to check skb-\u003eprotocol. It may crash on short packets due\nto ip_hdr() access.\n\nSigned-off-by: Guillaume Gaudonville \u003cguillaume.gaudonville@6wind.com\u003e\nAcked-by: Peter P Waskiewicz Jr \u003cpeter.p.waskiewicz.jr@intel.com\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9f756f018a6d9f83556f972ce7fcd6870274efae", "tree": "bea07e369110ef623c068acfc1f01e748cee4954", "parents": [ "fa37813401ff52d78591c262d6542e4d5d935584" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Tue Jun 29 18:28:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 23:12:40 2010 -0700" }, "message": "ixgbe: disable tx engine before disabling tx laser\n\nDisabling the tx laser while receiving DMA requests\ncan hang the device. After this occurs the device\nis in a bad state. The GPIO bit never clears when\nPCI master access is disabled and a reboot is required\nto get the device in a good state again.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nAcked-by: Peter P Waskiewicz Jr \u003cpeter.p.waskiewicz.jr@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa37813401ff52d78591c262d6542e4d5d935584", "tree": "ad9f85a1a60289f270d04d4982588bd439e1508f", "parents": [ "bf988435bd5b53529f4408a8efb1f433f6ddfda9" ], "author": { "name": "Andy Gospodarek", "email": "andy@greyhouse.net", "time": "Tue Jun 29 18:28:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 23:12:39 2010 -0700" }, "message": "ixgbe: fix panic when shutting down system with WoL enabled\n\nThis patch added to 2.6.34:\n\n\tcommit 5f6c01819979afbfec7e0b15fe52371b8eed87e8\n\tAuthor: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\n\tDate: Wed Apr 14 16:04:23 2010 -0700\n\n\t ixgbe: fix bug with vlan strip in promsic mode\n\namong other things added a function called ixgbe_vlan_filter_enable.\nThis new function wants to access and set some rx_ring parameters, but\nadapter-\u003erx_ring has already been freed. This simply moves the free\nuntil after the access and makes __ixgbe_shutdown look more like\nixgbe_remove.\n\nSigned-off-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nAcked-by: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c22d7ac844f1cb9c6a5fd20f89ebadc2feef891b", "tree": "63af10f1115dfdc5ec0c08765ba342b62809d808", "parents": [ "e2f5b04563786d4b7d7648868de7e941a0649372" ], "author": { "name": "Andy Gospodarek", "email": "andy@greyhouse.net", "time": "Fri Jun 25 09:50:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:54:10 2010 -0700" }, "message": "bonding: prevent netpoll over bonded interfaces\n\nSupport for netpoll over bonded interfaces was added here:\n\n\tcommit f6dc31a85cd46a959bdd987adad14c3b645e03c1\n\tAuthor: WANG Cong \u003camwang@redhat.com\u003e\n\tDate: Thu May 6 00:48:51 2010 -0700\n\n\t bonding: make bonding support netpoll\n\nbut it is bad enough that we should probably just disable netpoll over\nbonding until some of the locking logic in the bonding driver is changed\nor converted completely to RCU. Simple actions like changing the active\nslave in active-backup mode will hang the box if a high enough printk\ndebugging level is enabled.\n\nKeeping the old code around will be good for anyone that wants to work\non it (and for after the RCU conversion), so I propose this small patch\nrather than ripping it all out.\n\nSigned-off-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "31cafd958932a90174118ad062fdc37ffb6bf31c", "tree": "21f04c11d9e759c1f65cfaa1e4fbd79ee1e60753", "parents": [ "e7865c234fff2db474f21a62b2f906a70317c972", "e2f5b04563786d4b7d7648868de7e941a0649372" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 27 11:28:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 27 11:28:02 2010 -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: (52 commits)\n phylib: Add autoload support for the LXT973 phy.\n ISDN: hysdn, fix potential NULL dereference\n vxge: fix memory leak in vxge_alloc_msix() error path\n isdn/gigaset: correct CAPI connection state storage\n isdn/gigaset: encode HLC and BC together\n isdn/gigaset: correct CAPI DATA_B3 Delivery Confirmation\n isdn/gigaset: correct CAPI voice connection encoding\n isdn/gigaset: honor CAPI application\u0027s buffer size request\n cpmac: do not leak struct net_device on phy_connect errors\n smc91c92_cs: fix the problem that lan \u0026 modem does not work simultaneously\n ipv6: fix NULL reference in proxy neighbor discovery\n Bluetooth: Bring back var \u0027i\u0027 increment\n xfrm: check bundle policy existance before dereferencing it\n sky2: enable rx/tx in sky2_phy_reinit()\n cnic: Disable statistics initialization for eth clients that do not support statistics\n net: add dependency on fw class module to qlcnic and netxen_nic\n snmp: fix SNMP_ADD_STATS()\n hso: remove setting of low_latency flag\n udp: Fix bogus UFO packet generation\n lasi82596: fix netdev_mc_count conversion\n ...\n" }, { "commit": "e2f5b04563786d4b7d7648868de7e941a0649372", "tree": "6d57659d3d89ddca1f8fd5609973385c711ee929", "parents": [ "d41de3c10047d5f0b661593a8f4610a19f87621f" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Tue Jun 22 02:38:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 22:12:03 2010 -0700" }, "message": "phylib: Add autoload support for the LXT973 phy.\n\nCommit e13647c1 (phylib: Add support for the LXT973 phy.) added a new ID\nbut neglected to also add it to the MODULE_DEVICE_TABLE.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc413d9097dfc6237f37dcaf52346db1061a6119", "tree": "cc85bed1040342b75785fc85fcb013ae0d0e0595", "parents": [ "1b4843c5e8cbab86830da8a53b8288882060c059" ], "author": { "name": "Michal Schmidt", "email": "mschmidt@redhat.com", "time": "Thu Jun 24 04:13:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 22:10:04 2010 -0700" }, "message": "vxge: fix memory leak in vxge_alloc_msix() error path\n\nWhen pci_enable_msix() returned ret\u003c0, entries and vxge_entries were leaked.\nWhile at it, use the centralized exit idiom in the function.\n\nSigned-off-by: Michal Schmidt \u003cmschmidt@redhat.com\u003e\nAcked-by: Ram Vepa \u003cram.vepa@exar.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ed770f01360b392564650bf1553ce723fa46afec", "tree": "e8d527f70f2746f823b907a4f8406963cb0f36ff", "parents": [ "9735b7ef005aaef5e5905cddba893f8725cd8867" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Sun Jun 20 22:07:48 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:16:58 2010 -0700" }, "message": "cpmac: do not leak struct net_device on phy_connect errors\n\nIf the call to phy_connect fails, we will return directly instead of freeing\nthe previously allocated struct net_device.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nCC: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9735b7ef005aaef5e5905cddba893f8725cd8867", "tree": "ab788df49e09c70466fcf69e60b9ee9c84033059", "parents": [ "9f888160bdcccf0565dd2774956b8d9456e610be" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Jun 19 15:24:27 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:16:58 2010 -0700" }, "message": "smc91c92_cs: fix the problem that lan \u0026 modem does not work simultaneously\n\nsmc91c92_cs:\n Fix the problem that lan \u0026 modem does not work simultaneously\n in the Megahertz multi-function card.\n We need to write MEGAHERTZ_ISR to retrigger interrupt.\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "062bee448bd539580ef9f64efe50fdfe04eeb103", "tree": "76dd74bee15aa4803bb031076c12147e31bcdb14", "parents": [ "d1e89f37de2845db364ef6d67586cd882f86b557" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Fri Jun 18 11:33:17 2010 -0700" }, "committer": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Fri Jun 25 14:34:45 2010 -0700" }, "message": "iwlwifi: set TX_CMD_FLAG_PROT_REQUIRE_MSK in tx_flag\n\nWhen building tx command, always set TX_CMD_FLAG_PROT_REQUIRE_MSK\nfor 5000 series and up.\n\nWithout setting this bit the firmware will not examine the RTS/CTS setting\nand thus not send traffic with the appropriate protection. RTS/CTS is is\nrequired for HT traffic in a noisy environment where, without this setting,\nconnections will stall on some hardware as documented in the patch that\ninitially attempted to address this:\n\n commit 1152dcc28c66a74b5b3f1a3ede0aa6729bfd48e4\n Author: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\n Date: Fri Jan 15 13:42:58 2010 -0800\n\n iwlwifi: Fix throughput stall issue in HT mode for 5000\n\n Similar to 6000 and 1000 series, RTS/CTS is the recommended\n protection mechanism for 5000 series in HT mode based on the HW design.\n Using RTS/CTS will better protect the inner exchange from interference,\n especially in highly-congested environment, it also prevent uCode encounter\n TX FIFO underrun and other HT mode related performance issues.\n\nFor 3945 and 4965, different flags are used for RTS/CTS or CTS-to-Self\nprotection.\n\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\n" }, { "commit": "d1e89f37de2845db364ef6d67586cd882f86b557", "tree": "dc437d369db1f3b7abede121361f2acac2041377", "parents": [ "6c3118e2305326743acb52250bcfd0d52389d9dc" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Jun 18 03:41:25 2010 -0700" }, "committer": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Fri Jun 25 14:32:06 2010 -0700" }, "message": "iwlwifi: fix multicast\n\ncommit 3474ad635db371b0d8d0ee40086f15d223d5b6a4\nAuthor: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nDate: Thu Apr 29 04:43:05 2010 -0700\n\n iwlwifi: apply filter flags directly\n\nbroke multicast. The reason, it turns out, is that\nthe code previously checked if ALLMULTI _changed_,\nwhich the new code no longer did, and normally it\n_never_ changes. Had somebody changed it manually,\nthe code prior to my patch there would have been\nbroken already.\n\nThe reason is that we always, unconditionally, ask\nthe device to pass up all multicast frames, but the\nnew code made it depend on ALLMULTI which broke it\nsince now we\u0027d pass up multicast frames depending\non the default filter in the device, which isn\u0027t\nnecessarily what we want (since we don\u0027t program it\nright now).\n\nFix this by simply not checking allmulti as we have\nallmulti behaviour enabled already anyway.\n\nReported-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nTested-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "38000a94a902e94ca8b5498f7871c6316de8957a", "tree": "3f749a720a341e8598017f5ab1f417d7a3625c87", "parents": [ "6b2a541db58dba5860ccbcfaf36caee064b8a9fd" ], "author": { "name": "Brandon Philips", "email": "brandon@ifup.org", "time": "Wed Jun 16 16:21:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 14:37:04 2010 -0700" }, "message": "sky2: enable rx/tx in sky2_phy_reinit()\n\nsky2_phy_reinit is called by the ethtool helpers sky2_set_settings,\nsky2_nway_reset and sky2_set_pauseparam when netif_running.\n\nHowever, at the end of sky2_phy_init GM_GP_CTRL has GM_GPCR_RX_ENA and\nGM_GPCR_TX_ENA cleared. So, doing these commands causes the device to\nstop working:\n\n$ ethtool -r eth0\n$ ethtool -A eth0 autoneg off\n\nFix this issue by enabling Rx/Tx after running sky2_phy_init in\nsky2_phy_reinit.\n\nSigned-off-by: Brandon Philips \u003cbphilips@suse.de\u003e\nTested-by: Brandon Philips \u003cbphilips@suse.de\u003e\nCc: stable@kernel.org\nTested-by: Mike McCormack \u003cmikem@ring3k.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c3118e2305326743acb52250bcfd0d52389d9dc", "tree": "81669df30c7d5fce6ee45c297cf6da0fdf334b05", "parents": [ "b6855772f4a22c4fbdd4fcaceff5c8a527035123" ], "author": { "name": "Vasanthakumar Thiagarajan", "email": "vasanth@atheros.com", "time": "Wed Jun 23 06:49:21 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 23 15:28:42 2010 -0400" }, "message": "ath9k: Fix bug in starting ani\n\nThere are few places where ANI is started without checking\nif it is right to start. This might lead to a case where ani\ntimer would be left undeleted and cause improper memory acccess\nduring module unload. This bug is clearly exposed with\npaprd support where the driver detects tx hang and does a\nchip reset. During this reset ani is (re)started without checking\nif it needs to be started. This would leave a timer scheduled\neven after all the resources are freed and cause a panic.\n\nThis patch introduces a bit in sc_flags to indicate if ani\nneeds to be started in sw_scan_start() and ath_reset().\nThis would fix the following panic. This issue is easily seen\nwith ar9003 + paprd.\n\n BUG: unable to handle kernel paging request at 0000000000003f38\n[\u003cffffffff81075391\u003e] ? __queue_work+0x41/0x50\n[\u003cffffffff8106afaa\u003e] run_timer_softirq+0x17a/0x370\n[\u003cffffffff81088be8\u003e] ? tick_dev_program_event+0x48/0x110\n[\u003cffffffff81061f69\u003e] __do_softirq+0xb9/0x1f0\n[\u003cffffffff810ba060\u003e] ? handle_IRQ_event+0x50/0x160\n[\u003cffffffff8100af5c\u003e] call_softirq+0x1c/0x30\n[\u003cffffffff8100c9f5\u003e] do_softirq+0x65/0xa0\n[\u003cffffffff81061e25\u003e] irq_exit+0x85/0x90\n[\u003cffffffff8155e095\u003e] do_IRQ+0x75/0xf0\n[\u003cffffffff815570d3\u003e] ret_from_intr+0x0/0x11\n\u003cEOI\u003e\n[\u003cffffffff812fd67b\u003e] ? acpi_idle_enter_simple+0xe4/0x119\n[\u003cffffffff812fd674\u003e] ? acpi_idle_enter_simple+0xdd/0x119\n[\u003cffffffff81441c87\u003e] cpuidle_idle_call+0xa7/0x140\n[\u003cffffffff81008da3\u003e] cpu_idle+0xb3/0x110\n[\u003cffffffff81550722\u003e] start_secondary+0x1ee/0x1f5\n\nSigned-off-by: Vasanthakumar Thiagarajan \u003cvasanth@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "6b2a541db58dba5860ccbcfaf36caee064b8a9fd", "tree": "c461ffb8fe6758ceda236e7e01f80fc85242af9b", "parents": [ "06aeb78b85d8c04af03eb37353aa0df98d3db170" ], "author": { "name": "Dmitry Kravkov", "email": "dmitry@broadcom.com", "time": "Wed Jun 23 11:57:09 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:57:09 2010 -0700" }, "message": "cnic: Disable statistics initialization for eth clients that do not support statistics\n\nDisable statistics initialization for eth clients that do not support\n statistics. This prevents memory corruption on bnx2x hw.\n\nSigned-off-by: Dmitry Kravkov \u003cdmitry@broadcom.com\u003e\nSigned-off-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: Eilon Greenstein \u003ceilong@broadcom.com\u003e\n" }, { "commit": "06aeb78b85d8c04af03eb37353aa0df98d3db170", "tree": "5af953f41f0d17c9c1ab23e3a91d1c184e42adb3", "parents": [ "8f1c14b2e3b1805d3e9e6a306d07f5371ea703a7" ], "author": { "name": "Anirban Chakraborty", "email": "anirban.chakraborty@qlogic.com", "time": "Wed Jun 23 11:49:42 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:49:42 2010 -0700" }, "message": "net: add dependency on fw class module to qlcnic and netxen_nic\n\nnetxen_nic and qlcnic driver depends on firmware_class module.\n\nSigned-off-by: Anirban Chakraborty \u003canirban.chakraborty@qlogic.com\u003e\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8ceedea7c2600a1018d20f67e766c0773b59391a", "tree": "596b2e9ceb312903d7437825dc45c9aa838ff71f", "parents": [ "d5dc0ae4df9db00b8122378d56a071039b17a1eb", "b6855772f4a22c4fbdd4fcaceff5c8a527035123" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 22 10:54:12 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 22 10:54:12 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\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": "13fea6d4f73942e6961aec97ba4c593619d18f6f", "tree": "b66b3b4989e00fc76432e00595c9eded681bb732", "parents": [ "ade2d3db21b0625f9528bcd6f1656dd7c8d0fe08" ], "author": { "name": "Helge Deller", "email": "deller@gmx.de", "time": "Mon Jun 21 13:50:18 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 21 13:50:18 2010 -0700" }, "message": "lasi82596: fix netdev_mc_count conversion\n\nFix commit 4cd24eaf0 (net: use netdev_mc_count and netdev_mc_empty when\nappropriate)\n\nSigned-off-by: Helge Deller \u003cdeller@gmx.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ade2d3db21b0625f9528bcd6f1656dd7c8d0fe08", "tree": "7b4af0a448883fc8ee778eca69c2619cdf403044", "parents": [ "25442e06d20aaba7d7b16438078a562b3e4cf19b" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Jun 21 03:44:50 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 21 13:40:25 2010 -0700" }, "message": "NET: MIPSsim: Fix modpost warning.\n\n$ make CONFIG_DEBUG_SECTION_MISMATCH\u003dy\n[...]\nWARNING: drivers/net/built-in.o(.data+0x0): Section mismatch in reference from the variable mipsnet_driver to the function .init.text:mipsnet_probe()\nThe variable mipsnet_driver references\nthe function __init mipsnet_probe()\nIf the reference is valid then annotate the\nvariable with __init* or __refdata (see linux/init.h) or name the variable:\n*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,\n[...]\n\nFixed by making mipsnet_probe __devinit.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\n\n drivers/net/mipsnet.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b6855772f4a22c4fbdd4fcaceff5c8a527035123", "tree": "24432748ec8bbc151ac00828b7e37d60b36642f6", "parents": [ "021570e55b7152843376b9d9f60624e3e05ac054" ], "author": { "name": "Bob Copeland", "email": "me@bobcopeland.com", "time": "Fri Jun 18 13:15:23 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 18 14:59:10 2010 -0400" }, "message": "ath5k: initialize ah-\u003eah_current_channel\n\nath5k assumes ah_current_channel is always a valid pointer in\nseveral places, but a newly created interface may not have a\nchannel. To avoid null pointer dereferences, set it up to point\nto the first available channel until later reconfigured.\n\nThis fixes the following oops:\n$ rmmod ath5k\n$ insmod ath5k\n$ iw phy0 set distance 11000\n\nBUG: unable to handle kernel NULL pointer dereference at 00000006\nIP: [\u003cd0a1ff24\u003e] ath5k_hw_set_coverage_class+0x74/0x1b0 [ath5k]\n*pde \u003d 00000000\nOops: 0000 [#1]\nlast sysfs file: /sys/devices/pci0000:00/0000:00:0e.0/ieee80211/phy0/index\nModules linked in: usbhid option usb_storage usbserial usblp evdev lm90\nscx200_acb i2c_algo_bit i2c_dev i2c_core via_rhine ohci_hcd ne2k_pci\n8390 leds_alix2 xt_IMQ imq nf_nat_tftp nf_conntrack_tftp nf_nat_irc nf_cc\n\nPid: 1597, comm: iw Not tainted (2.6.32.14 #8)\nEIP: 0060:[\u003cd0a1ff24\u003e] EFLAGS: 00010296 CPU: 0\nEIP is at ath5k_hw_set_coverage_class+0x74/0x1b0 [ath5k]\nEAX: 000000c2 EBX: 00000000 ECX: ffffffff EDX: c12d2080\nESI: 00000019 EDI: cf8c0000 EBP: d0a30edc ESP: cfa09bf4\n DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068\nProcess iw (pid: 1597, ti\u003dcfa09000 task\u003dcf88a000 task.ti\u003dcfa09000)\nStack:\n d0a34f35 d0a353f8 d0a30edc 000000fe cf8c0000 00000000 1900063d cfa8c9e0\n\u003c0\u003e cfa8c9e8 cfa8c0c0 cfa8c000 d0a27f0c 199d84b4 cfa8c200 00000010 d09bfdc7\n\u003c0\u003e 00000000 00000000 ffffffff d08e0d28 cf9263c0 00000001 cfa09cc4 00000000\nCall Trace:\n [\u003cd0a27f0c\u003e] ? ath5k_hw_attach+0xc8c/0x3c10 [ath5k]\n [\u003cd09bfdc7\u003e] ? __ieee80211_request_smps+0x1347/0x1580 [mac80211]\n [\u003cd08e0d28\u003e] ? nl80211_send_scan_start+0x7b8/0x4520 [cfg80211]\n [\u003cc10f5db9\u003e] ? nla_parse+0x59/0xc0\n [\u003cc11ca8d9\u003e] ? genl_rcv_msg+0x169/0x1a0\n [\u003cc11ca770\u003e] ? genl_rcv_msg+0x0/0x1a0\n [\u003cc11c7e68\u003e] ? netlink_rcv_skb+0x38/0x90\n [\u003cc11c9649\u003e] ? genl_rcv+0x19/0x30\n [\u003cc11c7c03\u003e] ? netlink_unicast+0x1b3/0x220\n [\u003cc11c893e\u003e] ? netlink_sendmsg+0x26e/0x290\n [\u003cc11a409e\u003e] ? sock_sendmsg+0xbe/0xf0\n [\u003cc1032780\u003e] ? autoremove_wake_function+0x0/0x50\n [\u003cc104d846\u003e] ? __alloc_pages_nodemask+0x106/0x530\n [\u003cc1074933\u003e] ? do_lookup+0x53/0x1b0\n [\u003cc10766f9\u003e] ? __link_path_walk+0x9b9/0x9e0\n [\u003cc11acab0\u003e] ? verify_iovec+0x50/0x90\n [\u003cc11a42b1\u003e] ? sys_sendmsg+0x1e1/0x270\n [\u003cc1048e50\u003e] ? find_get_page+0x10/0x50\n [\u003cc104a96f\u003e] ? filemap_fault+0x5f/0x370\n [\u003cc1059159\u003e] ? __do_fault+0x319/0x370\n [\u003cc11a55b4\u003e] ? sys_socketcall+0x244/0x290\n [\u003cc101962c\u003e] ? do_page_fault+0x1ec/0x270\n [\u003cc1019440\u003e] ? do_page_fault+0x0/0x270\n [\u003cc1002ae5\u003e] ? syscall_call+0x7/0xb\nCode: 00 b8 fe 00 00 00 b9 f8 53 a3 d0 89 5c 24 14 89 7c 24 10 89 44 24\n0c 89 6c 24 08 89 4c 24 04 c7 04 24 35 4f a3 d0 e8 7c 30 60 f0 \u003c0f\u003e b7\n43 06 ba 06 00 00 00 a8 10 75 0e 83 e0 20 83 f8 01 19 d2\nEIP: [\u003cd0a1ff24\u003e] ath5k_hw_set_coverage_class+0x74/0x1b0 [ath5k] SS:ESP\n0068:cfa09bf4\nCR2: 0000000000000006\n---[ end trace 54f73d6b10ceb87b ]---\n\nCc: stable@kernel.org\nReported-by: Steve Brown \u003csbrown@cortland.com\u003e\nSigned-off-by: Bob Copeland \u003cme@bobcopeland.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "aabef8b240880439b91574c9a9e33dcc44bfd8c7", "tree": "80cc9175da9ca00d179ac83b9039fa9ed6e1be14", "parents": [ "db176edc89abbf22e6db6853f8581f9475fe8ec1" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Thu Jun 17 08:56:05 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 17 08:56:05 2010 -0700" }, "message": "bnx2: fix dma_get_ops compilation breakage\n\nThis removes dma_get_ops() prefetch optimization in bnx2.\n\nbnx2 uses dma_get_ops() to see if dma_sync_single_for_cpu() is\nnoop. bnx2 does prefetch if it\u0027s noop.\n\nBut dma_get_ops() isn\u0027t available on all the architectures (only the\narchitectures that uses dma_map_ops struct have it). Using\ndma_get_ops() in drivers leads to compilation breakage on many\narchitectures.\n\nThis patch removes dma_get_ops() and changes bnx2 to do prefetch on\nall the architectures. This adds useless prefetch on non-coherent\narchitectures but this is harmless. It is also unlikely to cause the\nperformance drop.\n\n[ Remove now unused local variable \u0027pdev\u0027 -DaveM ]\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: Michael Chan \u003cmchan@broadcom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "db176edc89abbf22e6db6853f8581f9475fe8ec1", "tree": "a853cd9273656c704b07cebaa9f25084b7a8c749", "parents": [ "8b1d920fa5ea8e3d941e908fa57acc9b1df9ca92" ], "author": { "name": "Sergey Matyukevich", "email": "geomatsi@gmail.com", "time": "Mon Jun 14 06:35:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 18:14:59 2010 -0700" }, "message": "ucc_geth: fix for RX skb buffers recycling\n\nThis patch implements a proper modification of RX skb buffers before\nrecycling. Adjusting only skb-\u003edata is not enough because after that\nskb-\u003etail and skb-\u003elen become incorrect.\n\nSigned-off-by: Sergey Matyukevich \u003cgeomatsi@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b1d920fa5ea8e3d941e908fa57acc9b1df9ca92", "tree": "aa4f3a3d73d788af50de2b87b057adf96a99303a", "parents": [ "63b88b9041ceef8217f34de71a2e96f0c3f0fd3b" ], "author": { "name": "Ken Kawasaki", "email": "ken_kawasaki@spring.nifty.jp", "time": "Sat Jun 12 00:17:28 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 18:10:54 2010 -0700" }, "message": "pcnet_cs: add new id (TOSHIBA Modem/LAN Card)\n\npcnet_cs:\nserial_cs:\n add new id (TOSHIBA Modem/LAN Card)\n\nSigned-off-by: Ken Kawasaki \u003cken_kawasaki@spring.nifty.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "63b88b9041ceef8217f34de71a2e96f0c3f0fd3b", "tree": "368562057a08a641873e256d2a271d1fc8561940", "parents": [ "099473c16bac7b936994bc95b5fd96f36397e1ad" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Fri Jun 11 10:51:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 18:09:17 2010 -0700" }, "message": "gianfar: Fix oversized packets handling\n\nIssuing the following command on host:\n\n$ ifconfig eth2 mtu 1600 ; ping 10.0.0.27 -s 1485 -c 1\n\nMakes some boards (tested with MPC8315 rev 1.1 and MPC8313 rev 1.0)\noops like this:\n\n skb_over_panic: text:c0195914 len:1537 put:1537 head:c79e4800 data:c79e4880 tail:0xc79e4e81 end:0xc79e4e80 dev:eth1\n ------------[ cut here ]------------\n kernel BUG at net/core/skbuff.c:127!\n Oops: Exception in kernel mode, sig: 5 [#1]\n MPC831x RDB\n last sysfs file: /sys/kernel/uevent_seqnum\n Modules linked in:\n NIP: c01c1840 LR: c01c1840 CTR: c016d918\n [...]\n NIP [c01c1840] skb_over_panic+0x48/0x5c\n LR [c01c1840] skb_over_panic+0x48/0x5c\n Call Trace:\n [c0339d50] [c01c1840] skb_over_panic+0x48/0x5c (unreliable)\n [c0339d60] [c01c3020] skb_put+0x5c/0x60\n [c0339d70] [c0195914] gfar_clean_rx_ring+0x25c/0x3d0\n [c0339dc0] [c01976e8] gfar_poll+0x170/0x1bc\n\nDumped buffer descriptors showed that eTSEC\u0027s length/truncation\nlogic sometimes passes oversized packets, i.e. for the above ICMP\npacket the following two buffer descriptors may become ready:\n\n status\u003d1400 length\u003d1536\n status\u003d1800 length\u003d1541\n\nSo, it seems that gianfar actually receives the whole big frame,\nand it tries to place the packet into two BDs. This situation\nconfuses the driver, and so the skb_put() sanity check fails.\n\nThis patch fixes the issue by adding an appropriate check, i.e.\nthe driver should not try to process frames with buffer\ndescriptor\u0027s length over rx_buffer_size (i.e. maxfrm and mrblr).\n\nNote that sometimes eTSEC works correctly, i.e. in the second\n(last) buffer descriptor bits \u0027truncated\u0027 and \u0027crcerr\u0027 are set,\nand so there\u0027s no oops. Though I couldn\u0027t find any logic when\nit works correctly and when not.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "099473c16bac7b936994bc95b5fd96f36397e1ad", "tree": "09acc87af2002c2f737b83613394959120aee2c0", "parents": [ "a91fb143de61dce847e319ca79b9937a665ad622" ], "author": { "name": "Jan-Bernd Themann", "email": "ossthema@de.ibm.com", "time": "Tue Jun 15 05:35:42 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 18:05:27 2010 -0700" }, "message": "ehea: Fix kernel deadlock in DLPAR-mem processing\n\nPort reset operations and memory add/remove operations need to\nbe serialized to avoid a kernel deadlock. The deadlock is caused\nby calling the napi_disable() function twice.\nTherefore we have to employ the dlpar_mem_lock in the ehea_reset_port\nfunction as well\n\nSigned-off-by: Jan-Bernd Themann \u003cthemann@de.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a91fb143de61dce847e319ca79b9937a665ad622", "tree": "168a8dbf4cd8408747972d0ddec741ac8c358b9c", "parents": [ "756725064fe6abbcdb43b1e64d017649b828be35" ], "author": { "name": "Jan-Bernd Themann", "email": "ossthema@de.ibm.com", "time": "Tue Jun 15 05:35:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 18:05:26 2010 -0700" }, "message": "ehea: fix delayed packet processing\n\nIn the eHEA poll function an rmb() is required. Without that some packets\non the receive queue are not seen and thus delayed until the next interrupt\nis handled for the same receive queue.\n\nSigned-off-by: Jan-Bernd Themann \u003cthemann@de.ibm.com\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "756725064fe6abbcdb43b1e64d017649b828be35", "tree": "e89556ac83efad708986b4c5e3d83a854d4a703d", "parents": [ "fa68a7822780fdc1295f7efb7e4313e62b447e75" ], "author": { "name": "Don Skidmore", "email": "donald.c.skidmore@intel.com", "time": "Tue Jun 15 09:23:17 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:47:30 2010 -0700" }, "message": "ixgbe: add comment on SFP+ ID for Active DA\n\nThese comments were forgotten in the initial patch to add this\nfunctionality. This patch corrects that.\n\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "97553f7f3e7a0305d017df9cc6e9589f64878437", "tree": "15e2db21159b73d88020b9be834a7243ab7c433f", "parents": [ "d8d326dc7ae6bec2a999d674c5babb6bf490587a" ], "author": { "name": "Manfred Rudigier", "email": "Manfred.Rudigier@omicron.at", "time": "Fri Jun 11 01:49:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:40:02 2010 -0700" }, "message": "gianfar: Fix setup of RX time stamping\n\nPreviously the RCTRL_TS_ENABLE bit was set unconditionally. However, if\nthe RCTRL_TS_ENABLE is set without TMR_CTRL[TE], the driver does not work\nproperly on some boards (Anton had problems with the MPC8313ERDB and\nMPC8568EMDS).\n\nWith this patch the bit will only be set if requested from user space\nwith the SIOCSHWTSTAMP ioctl command, meaning that time stamping is\ndisabled during normal operation. Users who are not interested in time\nstamps will not experience problems with buggy CPU revisions or\nperformance drops any more.\n\nThe setting of TMR_CTRL[TE] is still up to the user. This is considered\nsafe because users wanting HW timestamps must initialize the eTSEC clock\nfirst anyway, e.g. with the recently submitted PTP clock driver.\n\nSigned-off-by: Manfred Rudigier \u003cmanfred.rudigier@omicron.at\u003e\nReviewed-by: Anton Vorontsov \u003ccbouatmailru@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d8d326dc7ae6bec2a999d674c5babb6bf490587a", "tree": "0169a23e34712e4a34db9c3dd658c14a59ded5d9", "parents": [ "fed396a585d8e1870b326f2e8e1888a72957abb8", "021570e55b7152843376b9d9f60624e3e05ac054" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 13:41:55 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 13:41:55 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "7e43cd66d36e8f0900e87d9d287c9ee649cbdd07", "tree": "489e5190b099b12a5e8417fda00a697d180348a2", "parents": [ "2227bae22becb88b75ede022c7bb991aabfb50bb" ], "author": { "name": "Amit Kumar Salecha", "email": "amit.salecha@qlogic.com", "time": "Sun Jun 13 23:39:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 18:15:27 2010 -0700" }, "message": "netxen: fix caching window register\n\nCRB window register is not per pci-func for NX3031,\nso caching can result in incorrect values.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2227bae22becb88b75ede022c7bb991aabfb50bb", "tree": "3dcf27270876df33598085282de81678d233acde", "parents": [ "bf445080dad9542c6bc6b693d941cae89605134c" ], "author": { "name": "Amit Kumar Salecha", "email": "amit.salecha@qlogic.com", "time": "Sun Jun 13 23:39:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 18:15:27 2010 -0700" }, "message": "netxen: fix rcv buffer leak\n\nRcv producer should be read in spin-lock.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf445080dad9542c6bc6b693d941cae89605134c", "tree": "973dc69dee286bc97aa7f927481b3359e265c7bb", "parents": [ "44b496f685ca68c0d96eb3ad88e3948fad3417d6" ], "author": { "name": "Amit Kumar Salecha", "email": "amit.salecha@qlogic.com", "time": "Sun Jun 13 23:39:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 18:15:26 2010 -0700" }, "message": "netxen: fix memory leaks in error path\n\nFixes memory leak in error path when memory allocation\nfor adapter data structures fails.\n\nSigned-off-by: Amit Kumar Salecha \u003camit.salecha@qlogic.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "44b496f685ca68c0d96eb3ad88e3948fad3417d6", "tree": "b37c24be1e8ec9365043b898b9443e50be81360e", "parents": [ "21071344e67ebe2b2e1ae093728fc1d65246bcbd" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jun 11 04:44:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 14:55:31 2010 -0700" }, "message": "pcmcia: dev_node removal bugfix\n\nPatch c7c2fa07 removed one line too much from smc91c92_cs.c.\n\nReported-by: Komuro \u003ckomurojun-mbn@nifty.com\u003e\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6a574ff6bfb842bdb98065da053881ff527be46", "tree": "899cdc5cdfc75d21a8c258ecfc2bc6b1e1c79895", "parents": [ "a69b03e941abae00380fc6bc1877fb797a1b31e6" ], "author": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Tue Jun 08 11:33:02 2010 -0600" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 15 15:44:41 2010 -0400" }, "message": "hostap: Protect against initialization interrupt\n\nUse an irq spinlock to hold off the IRQ handler until\nenough early card init is complete such that the handler\ncan run without faulting.\n\nSigned-off-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "84cc1535cb9043ea1921b81cb086138c0f2dc2b9", "tree": "ecbd1c6f3a341863a33094dafc1a7f5fdecc0efd", "parents": [ "932e0c201d28a728e25d3b641aa95bd28ceb08b4" ], "author": { "name": "Morten H. Larsen", "email": "m-larsen@post6.tele.dk", "time": "Tue Jun 15 13:24:58 2010 -0400" }, "committer": { "name": "Matt Turner", "email": "mattst88@gmail.com", "time": "Tue Jun 15 14:19:08 2010 -0400" }, "message": "alpha: Fix de2104x driver failing to readout MAC address correctly\n\nThis patch fixes a missing read memory barrier that is needed for the\ndriver to readout the MAC address correctly from the on-board ROM.\nAlso it replaces the use of the deprecated functions readl()/writel().\n\nSigned-off-by: Morten H. Larsen \u003cm-larsen@post6.tele.dk\u003e\nSigned-off-by: Matt Turner \u003cmattst88@gmail.com\u003e\n" }, { "commit": "a69b03e941abae00380fc6bc1877fb797a1b31e6", "tree": "b2ca2880137f0e1d0943370fc43be2006fc20685", "parents": [ "e7fdc95ef8e914ae8625f2ae4b3775b2bc435d3a" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 14:30:25 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 15 13:35:30 2010 -0400" }, "message": "iwlwifi: cancel scan watchdog in iwl_bg_abort_scan\n\nAvoids this:\n\nWARNING: at net/mac80211/scan.c:312 ieee80211_scan_completed+0x5f/0x1f1\n[mac80211]()\nHardware name: Latitude E5400\nModules linked in: aes_x86_64 aes_generic fuse ipt_MASQUERADE iptable_nat\nnf_nat rfcomm sco bridge stp llc bnep l2cap sunrpc cpufreq_ondemand\nacpi_cpufreq freq_table xt_physdev ip6t_REJECT nf_conntrack_ipv6\nip6table_filter ip6_tables ipv6 kvm_intel kvm uinput arc4 ecb\nsnd_hda_codec_intelhdmi snd_hda_codec_idt snd_hda_intel iwlagn snd_hda_codec\nsnd_hwdep snd_seq snd_seq_device iwlcore snd_pcm dell_wmi sdhci_pci sdhci\niTCO_wdt tg3 dell_laptop mmc_core i2c_i801 wmi mac80211 snd_timer\niTCO_vendor_support btusb joydev dcdbas cfg80211 bluetooth snd soundcore\nmicrocode rfkill snd_page_alloc firewire_ohci firewire_core crc_itu_t\nyenta_socket rsrc_nonstatic i915 drm_kms_helper drm i2c_algo_bit i2c_core video\noutput [last unloaded: scsi_wait_scan]\nPid: 979, comm: iwlagn Tainted: G W 2.6.33.3-85.fc13.x86_64 #1\nCall Trace:\n[\u003cffffffff8104b558\u003e] warn_slowpath_common+0x77/0x8f\n[\u003cffffffff8104b57f\u003e] warn_slowpath_null+0xf/0x11\n[\u003cffffffffa01bb7d9\u003e] ieee80211_scan_completed+0x5f/0x1f1 [mac80211]\n[\u003cffffffffa02a23f0\u003e] iwl_bg_scan_completed+0xbb/0x17a [iwlcore]\n[\u003cffffffff81060d3d\u003e] worker_thread+0x1a4/0x232\n[\u003cffffffffa02a2335\u003e] ? iwl_bg_scan_completed+0x0/0x17a [iwlcore]\n[\u003cffffffff81064817\u003e] ? autoremove_wake_function+0x0/0x34\n[\u003cffffffff81060b99\u003e] ? worker_thread+0x0/0x232\n[\u003cffffffff810643c7\u003e] kthread+0x7a/0x82\n[\u003cffffffff8100a924\u003e] kernel_thread_helper+0x4/0x10\n[\u003cffffffff8106434d\u003e] ? kthread+0x0/0x82\n[\u003cffffffff8100a920\u003e] ? kernel_thread_helper+0x0/0x10\n\nReported here:\n\n\thttps://bugzilla.redhat.com/show_bug.cgi?id\u003d590436\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nReported-by: Mihai Harpau \u003cmishu@piatafinanciara.ro\u003e\nCc: stable@kernel.org\nAcked-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\n" }, { "commit": "50900f1698f68127e54c67fdfe829e4a97b1be2b", "tree": "a3e3c924ca19e7a3563ccbd83faf1d28d2189186", "parents": [ "13deb23a52c13053fc509f119eb80b903c65a879" ], "author": { "name": "Joerg Albert", "email": "jal2@gmx.de", "time": "Sun Jun 13 14:22:23 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:05:06 2010 -0400" }, "message": "p54pci: add Symbol AP-300 minipci adapters pciid\n\nCc: stable@kernel.org\nSigned-off-by: Christian Lamparter \u003cchunkeey@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "13deb23a52c13053fc509f119eb80b903c65a879", "tree": "25b9555ed789ae51b762083b667cbdcebbfe48b7", "parents": [ "b561e8274f75831ee87e4ea378cbb1f9f050a51a" ], "author": { "name": "Prarit Bhargava", "email": "prarit@redhat.com", "time": "Thu Jun 10 08:08:42 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 14 15:04:29 2010 -0400" }, "message": "libertas_tf: Fix warning in lbtf_rx for stats struct\n\nFixes linux-2.6 warning:\n\ndrivers/net/wireless/libertas_tf/main.c: In function \u0027lbtf_rx\u0027:\ndrivers/net/wireless/libertas_tf/main.c:578: warning: \u0027stats.antenna\u0027 is used uninitialized in this function\ndrivers/net/wireless/libertas_tf/main.c:578: warning: \u0027stats.mactime\u0027 is used uninitialized in this function\n\nstats struct needs to be set to 0 before use.\n\nSigned-off-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "b561e8274f75831ee87e4ea378cbb1f9f050a51a", "tree": "edccfc3caea047e36b94e04ea6cf29a19dd416ba", "parents": [ "da5ae1cfff4cc5b9392eab59b227ad907626d7aa" ], "author": { "name": "Shanyu Zhao", "email": "shanyu.zhao@intel.com", "time": "Tue Jun 01 17:13:58 2010 -0700" }, "committer": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Mon Jun 14 10:51:37 2010 -0700" }, "message": "iwlagn: verify flow id in compressed BA packet\n\nThe flow id (scd_flow) in a compressed BA packet should match the txq_id\nof the queue from which the aggregated packets were sent. However, in\nsome hardware like the 1000 series, sometimes the flow id is 0 for the\ntxq_id (10 to 19). This can cause the annoying message:\n[ 2213.306191] iwlagn 0000:01:00.0: Received BA when not expected\n[ 2213.310178] iwlagn 0000:01:00.0: Read index for DMA queue txq id (0),\nindex 5, is out of range [0-256] 7 7.\n\nAnd even worse, if agg-\u003ewait_for_ba is true when the bad BA is arriving,\nthis can cause system hang due to NULL pointer dereference because the\ncode is operating in a wrong tx queue!\n\nSigned-off-by: Shanyu Zhao \u003cshanyu.zhao@intel.com\u003e\nSigned-off-by: Pradeep Kulkarni \u003cpradeepx.kulkarni@intel.com\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\n" }, { "commit": "da5ae1cfff4cc5b9392eab59b227ad907626d7aa", "tree": "67776b88a0f37dc2c0f2b839076279d1ecd78239", "parents": [ "b054b747a694927879c94dd11af54d04346aed7d" ], "author": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Fri May 28 09:28:39 2010 -0700" }, "committer": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Mon Jun 14 10:51:16 2010 -0700" }, "message": "iwlwifi: serialize station management actions\n\nWe are seeing some race conditions between incoming station management\nrequests (station add/remove) and the internal unassoc RXON command that\nmodifies station table. Modify these flows to require the mutex to be held\nand thus serializing them.\n\nThis fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id\u003d2207\n\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\n" }, { "commit": "28c8e4790ca5ef75f54895ca46437f9fbb433ddf", "tree": "335150601c08e1eecb819ce638e11430235ba4c1", "parents": [ "7837e58ce39bd727e0a163e7d34e479df36f6d29" ], "author": { "name": "Andy Gospodarek", "email": "andy@greyhouse.net", "time": "Fri Jun 11 12:47:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 18:20:53 2010 -0700" }, "message": "ixgbe: fix automatic LRO/RSC settings for low latency\n\nThis patch added to 2.6.34:\n\n\tcommit f8d1dcaf88bddc7f282722ec1fdddbcb06a72f18\n\tAuthor: Jesse Brandeburg \u003cjesse.brandeburg@intel.com\u003e\n\tDate: Tue Apr 27 01:37:20 2010 +0000\n\n\t ixgbe: enable extremely low latency\n\nintroduced a feature where LRO (called RSC on the hardware) was disabled\nautomatically when setting rx-usecs to 0 via ethtool. Some might not\nlike the fact that LRO was disabled automatically, but I\u0027m fine with\nthat. What I don\u0027t like is that LRO/RSC is automatically enabled when\nrx-usecs is set \u003e0 via ethtool.\n\nThis would certainly be a problem if the device was used for forwarding\nand it was determined that the low latency wasn\u0027t needed after the\ndevice was already forwarding. I played around with saving the state of\nLRO in the driver, but it just didn\u0027t seem worthwhile and would require\na small change to dev_disable_lro() that I did not like.\n\nThis patch simply leaves LRO disabled when setting rx-usecs \u003e0 and\nrequires that the user enable it again. An extra informational message\nwill also now appear in the log so users can understand why LRO isn\u0027t\nbeing enabled as they expect.\n\nInconsistency of LRO setting first noticed by Stanislaw Gruszka.\n\nSigned-off-by: Andy Gospodarek \u003candy@greyhouse.net\u003e\nCC: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nCC: stable@kernel.org\nTested-by: Stephen Ko \u003cstephen.s.ko@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7837e58ce39bd727e0a163e7d34e479df36f6d29", "tree": "6000cacc22ba2be7dd2fede5195e4f9dfc282cf9", "parents": [ "d08935c274b7e552e47633cf0cbd74b6e953d228" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Fri Jun 11 12:51:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 18:20:53 2010 -0700" }, "message": "e1000: Fix message logging defect\n\ncommit 675ad47375c76a7c3be4ace9554d92cd55518ced\nremoved the capability to use ethtool.set_msglevel to\ncontrol the types of messages emitted by the driver.\n\nThat commit should probably be reverted.\n\nIf not, then this patch fixes a message logging defect\nintroduced by converting a printk without KERN_\u003clevel\u003e\nto e_info.\n\nThis also reduces text by about 200 bytes.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nTested-by: Emil Tantilov \u003cemil.s.tantilov@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d08935c274b7e552e47633cf0cbd74b6e953d228", "tree": "531cbcadc890a3b13fb3a829431fd4b72618b48c", "parents": [ "e8d15e6460cb0eea00f2574a80d94496943403ba" ], "author": { "name": "Don Skidmore", "email": "donald.c.skidmore@intel.com", "time": "Fri Jun 11 13:20:29 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 13 18:20:52 2010 -0700" }, "message": "ixgbe: fix for race with 8259(8|9) during shutdown\n\nThere is a small window where the watchdog could be running as the\ninterface is brought down on a NIC with two ports wired back to back.\nIf ixgbe_update_status is then called can lead to a panic. This patch\nallows the update to bail if we are in that condition.\n\nThis issue was orignally reported and fix proposed by Akihiko Saitou.\n\nCC: Akihiko Saitou \u003casaitou@users.sourceforge.net\u003e\nSigned-off-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d49aba84fe775671133295658f43f4d142a517f9", "tree": "367f731720046001de6bb6f20ea4376303dcfb27", "parents": [ "e79aa8671033535c2e9ffc0a68010ae49ed5734c" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Jun 08 07:00:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 12 15:23:45 2010 -0700" }, "message": "enic: fix pci_alloc_consistent argument\n\nFix build warning on i386 (32-bit) with 32-bit dma_addr_t:\n\ndrivers/net/enic/vnic_dev.c: In function \u0027vnic_dev_init_prov\u0027:\ndrivers/net/enic/vnic_dev.c:716: warning: passing argument 3 of \u0027pci_alloc_consistent\u0027 from incompatible pointer type\ninclude/asm-generic/pci-dma-compat.h:16: note: expected \u0027dma_addr_t *\u0027 but argument is of type \u0027u64 *\u0027\n\nNow builds without warnings on i386 and on x86_64.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc:\tScott Feldman \u003cscofeldm@cisco.com\u003e\nCc:\tVasanthy Kolluri \u003cvkolluri@cisco.com\u003e\nCc:\tRoopa Prabhu \u003croprabhu@cisco.com\u003e\nAcked-by: Scott Feldman \u003cscofeldm@cisco.com\u003e\n" }, { "commit": "4cea8706c39023f5f721c88dd0ae17a097a39c98", "tree": "7eb589399dc10944cde2802d68adb5511405446f", "parents": [ "7ae1277a5202109a31d8f81ac99d4a53278dab84", "e79aa8671033535c2e9ffc0a68010ae49ed5734c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 11 14:20:03 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 11 14:20:03 2010 -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:\n wimax/i2400m: fix missing endian correction read in fw loader\n net8139: fix a race at the end of NAPI\n pktgen: Fix accuracy of inter-packet delay.\n pkt_sched: gen_estimator: add a new lock\n net: deliver skbs on inactive slaves to exact matches\n ipv6: fix ICMP6_MIB_OUTERRORS\n r8169: fix mdio_read and update mdio_write according to hw specs\n gianfar: Revive the driver for eTSEC devices (disable timestamping)\n caif: fix a couple range checks\n phylib: Add support for the LXT973 phy.\n net: Print num_rx_queues imbalance warning only when there are allocated queues\n" }, { "commit": "e79aa8671033535c2e9ffc0a68010ae49ed5734c", "tree": "237e16dd5d999f6ac2de89ae2a1d35ae0d4d74fd", "parents": [ "349124a00754129a5f1e43efa84733e364bf3749", "a385a53e659b35ebee604889e21c40e5c336941f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 12:38:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 11 12:38:23 2010 -0700" }, "message": "Merge branch \u0027wimax-2.6.35.y\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax\n" }, { "commit": "a385a53e659b35ebee604889e21c40e5c336941f", "tree": "b58b887077f435da273ee5922ed267f3357bdabd", "parents": [ "3a24934f065d23145f1c9c70da9f630c7a37795f" ], "author": { "name": "Inaky Perez-Gonzalez", "email": "inaky.perez-gonzalez@intel.com", "time": "Fri Jun 11 11:51:20 2010 -0700" }, "committer": { "name": "Inaky Perez-Gonzalez", "email": "inaky.perez-gonzalez@intel.com", "time": "Fri Jun 11 11:51:20 2010 -0700" }, "message": "wimax/i2400m: fix missing endian correction read in fw loader\n\ni2400m_fw_hdr_check() was accessing hardware field\nbcf_hdr-\u003emodule_type (little endian 32) without converting to host\nbyte sex.\n\nReported-by: Данилин Михаил \u003cmdanilin@nsg.net.ru\u003e\n\nSigned-off-by: Inaky Perez-Gonzalez \u003cinaky@linux.intel.com\u003e\n" }, { "commit": "f1f6ea352257e0df33cf0184ba777c293cb6f1d6", "tree": "bff9547a1f45db619848c5de62033cb48e61c73b", "parents": [ "63c70a0d7b59bac08bd14cd24c36f76aafc25de6", "b83156b52dd77979cc93bafc2283929532f6f7d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 11 09:55:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 11 09:55:21 2010 -0700" }, "message": "Merge branch \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6\n\n* \u0027urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:\n pcmcia: avoid validate_cis failure on CIS override\n pcmcia: dev_node removal bugfix\n pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI\n pcmcia: only keep saved I365_CSCINT flag if there is no PCI irq\n" }, { "commit": "349124a00754129a5f1e43efa84733e364bf3749", "tree": "acff33465eb6b21aadca78657a7fa330d6987936", "parents": [ "07a0f0f07a68014c92c752a5598102372bddf46e" ], "author": { "name": "Figo.zhang", "email": "zhangtianfei@leadcoretech.com", "time": "Mon Jun 07 21:13:22 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 23:14:08 2010 -0700" }, "message": "net8139: fix a race at the end of NAPI\n\nfix a race at the end of NAPI complete processing, it had\nbetter do __napi_complete() first before re-enable interrupt.\n\nSigned-off-by:Figo.zhang \u003cfigo1802@gmail.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "81a95f049962ec20a9aed888e676208b206f0f2e", "tree": "6084276117d85d181044d65bc1dd9c691cb11694", "parents": [ "ebedb22d2bacdcf577348eae77ab8f27c9db8ee8" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Wed Jun 09 17:31:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 17:31:48 2010 -0700" }, "message": "r8169: fix mdio_read and update mdio_write according to hw specs\n\nRealtek confirmed that a 20us delay is needed after mdio_read and\nmdio_write operations. Reduce the delay in mdio_write, and add it\nto mdio_read too. Also add a comment that the 20us is from hw specs.\n\nSigned-off-by: Timo Teräs \u003ctimo.teras@iki.fi\u003e\nAcked-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "619baba195d92ec39379e24c151f4a640898d140", "tree": "3acb28ffdd3ebbc8f4b99028b69f51c11ff0f105", "parents": [ "aea34e7ae7a40bc72f9f11b5658160dfb4b90c48" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Wed Jun 09 16:27:08 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:27:08 2010 -0700" }, "message": "gianfar: Revive the driver for eTSEC devices (disable timestamping)\n\nSince commit cc772ab7cdcaa24d1fae332d92a1602788644f7a (\"gianfar: Add\nhardware RX timestamping support\"), the driver no longer works on\nat least MPC8313ERDB and MPC8568EMDS boards (and possibly much more\nboards as well).\n\nThat\u0027s how MPC8313 Reference Manual describes RCTRL_TS_ENABLE bit:\n\n Timestamp incoming packets as padding bytes. PAL field is set\n to 8 if the PAL field is programmed to less than 8. Must be set\n to zero if TMR_CTRL[TE]\u003d0.\n\nI see that the commit above sets this bit, but it doesn\u0027t handle\nTMR_CTRL. Manfred probably had this bit set by the firmware for\nhis boards. But obviously this isn\u0027t true for all boards in the\nwild.\n\nAlso, I recall that Freescale BSPs were explicitly disabling the\ntimestamping because of a performance drop.\n\nFor now, the best way to deal with this is just disable the\ntimestamping, and later we can discuss proper device tree bindings\nand implement enabling this feature via some property.\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e13647c158307f0e7ff5fc5bec34731f28917595", "tree": "157e393bed93f540a93e96fcafaac8f6f541f92c", "parents": [ "327723edebbbd621ed35b0d63073685eb225563e" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Mon Jun 07 05:39:32 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 16:17:02 2010 -0700" }, "message": "phylib: Add support for the LXT973 phy.\n\nThis patch implements a work around for Erratum 5, \"3.3 V Fiber Speed\nSelection.\" If the hardware wiring does not respect this erratum, then\nfiber optic mode will not work properly.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "63a07cb64ccc3ceae619d3298545d602ab5ecd38", "tree": "e14e76f552eecb8c8e9b5f377b809c74a01f6f28", "parents": [ "b95a56809343fb727c818ad1b9da14a17fa92ef6", "327723edebbbd621ed35b0d63073685eb225563e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 09 12:44:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 09 12:44:19 2010 -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: (21 commits)\n mac80211: fix deauth before assoc\n iwlwifi: add missing rcu_read_lock\n mac80211: fix function pointer check\n wireless: remove my name from the maintainer list\n ath5k: fix NULL pointer in antenna configuration\n p54usb: Add device ID for Dell WLA3310 USB\n wl1251: fix a memory leak in probe\n ipmr: dont corrupt lists\n 8139too: fix buffer overrun in rtl8139_init_board\n asix: check packet size against mtu+ETH_HLEN instead of ETH_FRAME_LEN\n r8169: fix random mdio_write failures\n ip6mr: fix a typo in ip6mr_for_each_table()\n iwlwifi: move sysfs_create_group to post request firmware\n iwlwifi: add name to Maintainers list\n iwl3945: fix internal scan\n iwl3945: enable stuck queue detection on 3945\n ipv6: avoid high order allocations\n ath5k: retain promiscuous setting\n ath5k: depend on CONFIG_PM_SLEEP for suspend/resume functions\n mac80211: process station blockack action frames from work\n ...\n" }, { "commit": "327723edebbbd621ed35b0d63073685eb225563e", "tree": "5983bf544284c4bd11028e198c937f86be358dc4", "parents": [ "035320d54758e21227987e3aae0d46e7a04f4ddc", "b054b747a694927879c94dd11af54d04346aed7d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 11:13:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 09 11:13:23 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "6db6340c42d027b6364d49fa99d69019aca24de4", "tree": "ac8e547e4f22edfaed9336899807112dbb185847", "parents": [ "35dd0509b21e4b5bab36b9eb80c8dab0322f5007" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Jun 07 21:20:38 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 08 14:34:08 2010 -0400" }, "message": "iwlwifi: add missing rcu_read_lock\n\nUsing ieee80211_find_sta() needs to be under\nRCU read lock, which iwlwifi currently misses,\nso fix it.\n\nCc: stable@kernel.org\nReported-by: Miles Lane \u003cmiles.lane@gmail.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nAcked-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nTested-by: Miles Lane \u003cmiles.lane@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "436c109adb54433fff689abd71c23a6505e46bb0", "tree": "ad7860f0d757f83b439e2cf6d5a9ef8dc0e1a6e7", "parents": [ "0f666a08901f8b01f294ca0ad751019375240ae3" ], "author": { "name": "Bruno Randolf", "email": "br1@einfach.org", "time": "Mon Jun 07 13:11:19 2010 +0900" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:43:57 2010 -0400" }, "message": "ath5k: fix NULL pointer in antenna configuration\n\nIf the channel is not set yet and we configure the antennas just store the\nsetting. It will be activated during the next reset, when the channel is set.\n\nSigned-off-by: Bruno Randolf \u003cbr1@einfach.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0f666a08901f8b01f294ca0ad751019375240ae3", "tree": "a930a2baf60a87143ba3a7152273b32adaa49224", "parents": [ "aa679c36756003f1fabdb9fc6f00eb159559f7c3" ], "author": { "name": "Jason Dravet", "email": "dravet@hotmail.com", "time": "Sat Jun 05 15:08:29 2010 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:42:52 2010 -0400" }, "message": "p54usb: Add device ID for Dell WLA3310 USB\n\nAdd Dell WLA3310 USB wireless card, which has a Z-Com XG-705A chipset, to the\nUSB Ids in p54usb.\n\nSigned-off-by: Jason Dravet \u003cdravet@hotmail.com\u003e\nTested-by: Richard Gregory Tillmore \u003crtillmore@gmail.com\u003e\nSigned-off-by: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nAcked-by: Christian Lamparter \u003cchunkeey@googlemail.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "aa679c36756003f1fabdb9fc6f00eb159559f7c3", "tree": "a59541ac3983582e50b4f9e4fdca49a4177754cd", "parents": [ "7d47618a2ade0cb6d8a0b2597029c383c1662fa0" ], "author": { "name": "Grazvydas Ignotas", "email": "notasas@gmail.com", "time": "Sat Jun 05 02:25:47 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 07 14:42:51 2010 -0400" }, "message": "wl1251: fix a memory leak in probe\n\nwl1251_sdio_probe() error path is missing wl1251_free_hw, add it.\n\nSigned-off-by: Grazvydas Ignotas \u003cnotasas@gmail.com\u003e\nAcked-by: Kalle Valo \u003ckvalo@adurom.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "287b87a350de4e344d60697a1f16abe2a6cd350a", "tree": "48a25729abe5231aa360c9de3d2806ff856c6db5", "parents": [ "4f2d364b315191bf9f8659f7d221acdf5506a989" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Jun 07 18:26:51 2010 +0200" }, "committer": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Mon Jun 07 18:26:51 2010 +0200" }, "message": "pcmcia: dev_node removal bugfix\n\nPatch c7c2fa07 removed one line too much from smc91c92_cs.c.\n\nReported-by: Komuro \u003ckomurojun-mbn@nifty.com\u003e\nCC: netdev@vger.kernel.org\nCC: linux-wireless@vger.kernel.org\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\n" }, { "commit": "3fd7fa4a89f0b85b9b33e922f15a2289c0fb8499", "tree": "b945b7fb52aada745b386f12392e86f997c6814d", "parents": [ "9227a46bfbac0516fb7428715a095e1bc59b872a" ], "author": { "name": "Denis Kirjanov", "email": "dkirjanov@kernel.org", "time": "Mon Jun 07 01:13:57 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 07 01:13:57 2010 -0700" }, "message": "8139too: fix buffer overrun in rtl8139_init_board\n\nFix rtl_chip_info buffer overrun when we can\u0027t identify the chip.\n(i \u003d ARRAY_SIZE (rtl_chip_info) in this case)\n\nSigned-off-by: Denis Kirjanov \u003cdkirjanov@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\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": "024a07bacf8287a6ddfa83e9d5b951c5e8b4070e", "tree": "1e414be3a1fa1dadaa70f2cac173f7328efb75e4", "parents": [ "8ffb335e8d696affc04f963bf73ce2196f80edb9" ], "author": { "name": "Timo Teräs", "email": "timo.teras@iki.fi", "time": "Sun Jun 06 15:38:47 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 06 15:38:47 2010 -0700" }, "message": "r8169: fix random mdio_write failures\n\nSome configurations need delay between the \"write completed\" indication\nand new write to work reliably.\n\nRealtek driver seems to use longer delay when polling the \"write complete\"\nbit, so it waits long enough between writes with high probability (but\ncould probably break too). This patch adds a new udelay to make sure we\nwait unconditionally some time after the write complete indication.\n\nThis caused a regression with XID 18000000 boards when the board specific\nphy configuration writing many mdio registers was added in commit\n2e955856ff (r8169: phy init for the 8169scd). Some of the configration\nmdio writes would almost always fail, and depending on failure might leave\nthe PHY in non-working state.\n\nSigned-off-by: Timo Teräs \u003ctimo.teras@iki.fi\u003e\nAcked-off-by: Francois Romieu \u003cromieu@fr.zoreil.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d47618a2ade0cb6d8a0b2597029c383c1662fa0", "tree": "6d1faddd085fc0ab444affaed93c92bde1ff0ff8", "parents": [ "9edc71b746efeaadc40e668964b76cda81fef386" ], "author": { "name": "Emmanuel Grumbach", "email": "emmanuel.grumbach@intel.com", "time": "Sun May 23 00:14:08 2010 -0700" }, "committer": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Sat Jun 05 23:02:39 2010 -0700" }, "message": "iwlwifi: move sysfs_create_group to post request firmware\n\nMove the sysfs_create_group to iwl_ucode_callback after we\nhave safely got the firmware.\n\nThe motivation to do this comes from a warning from lockdep which detected\nthat we request priv-\u003emutex while holding s_active during a sysfs request\n(show_statistics in the example copy pasted). The reverse order exists upon\nrequest_firmware: request_firmware which is a sysfs operation\nthat requires s_active is run under priv-\u003emutex.\n\nThis ensures that we don\u0027t get sysfs request before we finish to request\nthe firmware, avoiding this deadlock.\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ INFO: possible circular locking dependency detected ]\n-------------------------------------------------------\ncat/2595 is trying to acquire lock:\n (\u0026priv-\u003emutex){+.+.+.}, at: [\u003cfacfa598\u003e] show_statistics+0x48/0x100 [iwlagn]\n\nbut task is already holding lock:\n (s_active){++++.+}, at: [\u003cc0580ebd\u003e] sysfs_get_active_two+0x1d/0x50\n\nwhich lock already depends on the new lock.\n\nthe existing dependency chain (in reverse order) is:\n\n-\u003e #1 (s_active){++++.+}:\n [\u003cc0489b74\u003e] __lock_acquire+0xc44/0x1230\n [\u003cc048a1ed\u003e] lock_acquire+0x8d/0x110\n [\u003cc0581499\u003e] sysfs_addrm_finish+0xe9/0x180\n [\u003cc057f64a\u003e] sysfs_hash_and_remove+0x4a/0x80\n [\u003cc05829d4\u003e] sysfs_remove_group+0x44/0xd0\n [\u003cc0714b75\u003e] dpm_sysfs_remove+0x15/0x20\n [\u003cc070dac8\u003e] device_del+0x38/0x170\n [\u003cc070dc1e\u003e] device_unregister+0x1e/0x60\n [\u003cc071838d\u003e] _request_firmware+0x29d/0x550\n [\u003cc07186c7\u003e] request_firmware+0x17/0x20\n [\u003cfad01bf1\u003e] iwl_mac_start+0xb1/0x1230 [iwlagn]\n [\u003cfa46ba06\u003e] ieee80211_open+0x436/0x6f0 [mac80211]\n [\u003cc0808cd2\u003e] dev_open+0x92/0xf0\n [\u003cc0808b2b\u003e] dev_change_flags+0x7b/0x190\n [\u003cc08148e8\u003e] do_setlink+0x178/0x3b0\n [\u003cc0815169\u003e] rtnl_setlink+0xf9/0x130\n [\u003cc081453b\u003e] rtnetlink_rcv_msg+0x1bb/0x1f0\n [\u003cc0827ce6\u003e] netlink_rcv_skb+0x86/0xa0\n [\u003cc081436c\u003e] rtnetlink_rcv+0x1c/0x30\n [\u003cc08279c3\u003e] netlink_unicast+0x263/0x290\n [\u003cc0828768\u003e] netlink_sendmsg+0x1c8/0x2a0\n [\u003cc07f85fd\u003e] sock_sendmsg+0xcd/0x100\n [\u003cc07f964d\u003e] sys_sendmsg+0x15d/0x290\n [\u003cc07f9e6b\u003e] sys_socketcall+0xeb/0x2a0\n [\u003cc040ad9f\u003e] sysenter_do_call+0x12/0x38\n\n-\u003e #0 (\u0026priv-\u003emutex){+.+.+.}:\n [\u003cc0489f84\u003e] __lock_acquire+0x1054/0x1230\n [\u003cc048a1ed\u003e] lock_acquire+0x8d/0x110\n [\u003cc08bb358\u003e] __mutex_lock_common+0x58/0x470\n [\u003cc08bb84a\u003e] mutex_lock_nested+0x3a/0x50\n [\u003cfacfa598\u003e] show_statistics+0x48/0x100 [iwlagn]\n [\u003cc070d219\u003e] dev_attr_show+0x29/0x50\n [\u003cc057fecd\u003e] sysfs_read_file+0xdd/0x190\n [\u003cc052880f\u003e] vfs_read+0x9f/0x190\n [\u003cc0528d22\u003e] sys_read+0x42/0x70\n [\u003cc040ad9f\u003e] sysenter_do_call+0x12/0x38\n\nother info that might help us debug this:\n\n3 locks held by cat/2595:\n #0: (\u0026buffer-\u003emutex){+.+.+.}, at: [\u003cc057fe25\u003e] sysfs_read_file+0x35/0x190\n #1: (s_active){++++.+}, at: [\u003cc0580ecd\u003e] sysfs_get_active_two+0x2d/0x50\n #2: (s_active){++++.+}, at: [\u003cc0580ebd\u003e] sysfs_get_active_two+0x1d/0x50\n\nstack backtrace:\nPid: 2595, comm: cat Not tainted 2.6.33-tp-rc4 #2\nCall Trace:\n [\u003cc08b99ab\u003e] ? printk+0x1d/0x22\n [\u003cc0487752\u003e] print_circular_bug+0xc2/0xd0\n [\u003cc0489f84\u003e] __lock_acquire+0x1054/0x1230\n [\u003cc0478d81\u003e] ? sched_clock_cpu+0x121/0x180\n [\u003cc048a1ed\u003e] lock_acquire+0x8d/0x110\n [\u003cfacfa598\u003e] ? show_statistics+0x48/0x100 [iwlagn]\n [\u003cc08bb358\u003e] __mutex_lock_common+0x58/0x470\n [\u003cfacfa598\u003e] ? show_statistics+0x48/0x100 [iwlagn]\n [\u003cc08bb84a\u003e] mutex_lock_nested+0x3a/0x50\n [\u003cfacfa598\u003e] ? show_statistics+0x48/0x100 [iwlagn]\n [\u003cfacfa598\u003e] show_statistics+0x48/0x100 [iwlagn]\n [\u003cc0580cf9\u003e] ? sysfs_get_active+0x69/0xb0\n [\u003cfacfa550\u003e] ? show_statistics+0x0/0x100 [iwlagn]\n [\u003cc070d219\u003e] dev_attr_show+0x29/0x50\n [\u003cc057fecd\u003e] sysfs_read_file+0xdd/0x190\n [\u003cc05ff314\u003e] ? security_file_permission+0x14/0x20\n [\u003cc0528242\u003e] ? rw_verify_area+0x62/0xd0\n [\u003cc052880f\u003e] vfs_read+0x9f/0x190\n [\u003cc047745b\u003e] ? up_read+0x1b/0x30\n [\u003cc057fdf0\u003e] ? sysfs_read_file+0x0/0x190\n [\u003cc04af3b4\u003e] ? audit_syscall_entry+0x1f4/0x220\n [\u003cc0528d22\u003e] sys_read+0x42/0x70\n [\u003cc040ad9f\u003e] sysenter_do_call+0x12/0x38\n\nSigned-off-by: Emmanuel Grumbach \u003cemmanuel.grumbach@intel.com\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\n" }, { "commit": "1402364162afbaac1b8a74ee21aeb013e817ac7d", "tree": "4c75f24ce84ae40d14ab1ec6df79345045b3710d", "parents": [ "a6866ac93e6cb68091326e80b4fa4619a5957644" ], "author": { "name": "Abhijeet Kolekar", "email": "abhijeet.kolekar@intel.com", "time": "Wed Jun 02 21:15:10 2010 -0700" }, "committer": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Sat Jun 05 23:01:55 2010 -0700" }, "message": "iwl3945: fix internal scan\n\nPort of internal scan to iwl3945 missed introduction\nof iwl3945_get_single_channel_for_scan.\n\nFix the following bug by introducing the iwl3945_get_single_channel_for_scan\nhttp://bugzilla.intellinuxwireless.org/show_bug.cgi?id\u003d2208\n\nSigned-off-by: Abhijeet Kolekar \u003cabhijeet.kolekar@intel.com\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\n" }, { "commit": "a6866ac93e6cb68091326e80b4fa4619a5957644", "tree": "105a405792ce0423f1267976c0caa8b5af860d0e", "parents": [ "6b5dcccb495b66b3b0b9581cdccfed038e5d68a2" ], "author": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Thu May 20 10:54:40 2010 -0700" }, "committer": { "name": "Reinette Chatre", "email": "reinette.chatre@intel.com", "time": "Sat Jun 05 22:59:22 2010 -0700" }, "message": "iwl3945: enable stuck queue detection on 3945\n\nWe learn from\nhttp://bugzilla.intellinuxwireless.org/show_bug.cgi?id\u003d1834 and\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d589777\nthat 3945 can also suffer from a stuck command queue. Enable stuck queue\ndetection for iwl3945 to enable recovery in this case.\n\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\n" }, { "commit": "ed7dc1dfbcef301407a1e3138a49dc94e5a19d0a", "tree": "2aef7400d404774f0f8a30b6eefb0690a09ec24c", "parents": [ "7926e0bfbbc5ff81ddad0fda831eef7060e40997", "ca7335948e294faf8adf65f2c95ca18ea78540db" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 05 07:32:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 05 07:32:21 2010 -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: (30 commits)\n X25: remove duplicated #include\n tcp: use correct net ns in cookie_v4_check()\n rps: tcp: fix rps_sock_flow_table table updates\n ppp_generic: fix multilink fragment sizes\n syncookies: remove Kconfig text line about disabled-by-default\n ixgbe: only check pfc bits in hang logic if pfc is enabled\n net: check for refcount if pop a stacked dst_entry\n ixgbe: return IXGBE_ERR_RAR_INDEX when out of range\n act_pedit: access skb-\u003edata safely\n sfc: Store port number in net_device::dev_id\n epic100: Test __BIG_ENDIAN instead of (non-existent) CONFIG_BIG_ENDIAN\n tehuti: return -EFAULT on copy_to_user errors\n isdn/kcapi: return -EFAULT on copy_from_user errors\n e1000e: change logical negate to bitwise\n sfc: Get port number from CS_PORT_NUM, not PCI function number\n cls_u32: use skb_header_pointer() to dereference data safely\n TCP: tcp_hybla: Fix integer overflow in slow start increment\n act_nat: fix the wrong checksum when addr isn\u0027t in old_addr/mask\n net/fec: fix pm to survive to suspend/resume\n korina: count RX DMA OVR as rx_fifo_error\n ...\n" }, { "commit": "ca7335948e294faf8adf65f2c95ca18ea78540db", "tree": "998f5c9b854e348f4df2bd20b02c8652529681ce", "parents": [ "c44649216522cd607a4027d2ebf4a8147d3fa94c" ], "author": { "name": "Huang Weiyi", "email": "weiyi.huang@gmail.com", "time": "Fri Jun 04 16:14:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 16:14:48 2010 -0700" }, "message": "X25: remove duplicated #include\n\nRemove duplicated #include(\u0027s) in drivers/net/wan/x25_asy.c\n\nSigned-off-by: Huang Weiyi \u003cweiyi.huang@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "536e00e570c87f258554e919c444b81a7002e46d", "tree": "f7e13ef943936edda2bce1c3178c5966dfa3aae6", "parents": [ "57f1553ee5d9f093660cc49098f494e17ed11668" ], "author": { "name": "Ben McKeegan", "email": "ben@netservers.co.uk", "time": "Wed Jun 02 23:14:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 15:56:01 2010 -0700" }, "message": "ppp_generic: fix multilink fragment sizes\n\nFix bug in multilink fragment size calculation introduced by\ncommit 9c705260feea6ae329bc6b6d5f6d2ef0227eda0a\n\"ppp: ppp_mp_explode() redesign\"\n\nSigned-off-by: Ben McKeegan \u003cben@netservers.co.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ca739481662137b8f717bc21f16719cda3c33d6b", "tree": "8faf60448253ee555d8ff466f0a62eb6e3c743ee", "parents": [ "8764ab2ca7ab5055e1ca80f9cfa4970c34acb804" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jun 03 17:03:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 15:56:00 2010 -0700" }, "message": "ixgbe: only check pfc bits in hang logic if pfc is enabled\n\nOnly check pfc bits in hang logic if PFC is enabled. Previously,\nif DCB was enabled but PFC was disabled the incorrect pause\nbits would be checked.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nAcked-by: Don Skidmore \u003cdonald.c.skidmore@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b5dcccb495b66b3b0b9581cdccfed038e5d68a2", "tree": "ee5ee475145c3191e69cf8ada14ed6c0ee513f89", "parents": [ "e307139d7ad532761cdbf2a665f3c53c509a2d0e" ], "author": { "name": "Bob Copeland", "email": "me@bobcopeland.com", "time": "Fri Jun 04 08:14:14 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 04 15:50:52 2010 -0400" }, "message": "ath5k: retain promiscuous setting\n\nCommit 56d1de0a21db28e41741cfa0a66e18bc8d920554, \"ath5k: clean up\nfilter flags setting\" introduced a regression in monitor mode such\nthat the promisc filter flag would get lost.\n\nAlthough we set the promisc flag when it changed, we did not\npreserve it across subsequent calls to configure_filter. This patch\nrestores the original functionality.\n\nCc: stable@kernel.org\nBisected-by: weedy2887@gmail.com\nTested-by: weedy2887@gmail.com\nTested-by: Rick Farina \u003csidhayn@gmail.com\u003e\nSigned-off-by: Bob Copeland \u003cme@bobcopeland.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e307139d7ad532761cdbf2a665f3c53c509a2d0e", "tree": "72165d2916700793d555666473ed01b79b6d9959", "parents": [ "8b9a4e6e442756f670ef507f09bbc6c11dc0fca6" ], "author": { "name": "Tobias Doerffel", "email": "tobias.doerffel@gmail.com", "time": "Sun May 30 00:02:18 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 04 15:50:52 2010 -0400" }, "message": "ath5k: depend on CONFIG_PM_SLEEP for suspend/resume functions\n\nWhen building a kernel with CONFIG_PM\u003dy but neither suspend nor\nhibernate support, the compiler complains about the static functions\nath5k_pci_suspend() and ath5k_pci_resume() not being used:\n\ndrivers/net/wireless/ath/ath5k/base.c:713:12: warning: ‘ath5k_pci_suspend’ defined but not used\ndrivers/net/wireless/ath/ath5k/base.c:722:12: warning: ‘ath5k_pci_resume’ defined but not used\n\nDepending on CONFIG_PM_SLEEP rather than CONFIG_PM fixes the issue.\n\nSigned-off-by: Tobias Doerffel \u003ctobias.doerffel@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "56bf882230d2266a2e07b7f404dc96d157a65daa", "tree": "93a40ae8634f4669d7b7b67c907ce666d98829a7", "parents": [ "51a0d38de26226f2779912d92f155b93d539da9a" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 04 14:47:35 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 04 15:50:30 2010 -0400" }, "message": "Revert \"wireless: hostap, fix oops due to early probing interrupt\"\n\nThis reverts commit 15920d8afc87861672e16fa95ae2764b065d6dd3.\n\nThis patch was discovered to cause some hostap devices to fail to\ninitialized.\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16111\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "39059cceeda478cd040d521b9541d1113035c908", "tree": "56adf04d6766a4346160aacd709468e5b2f1b879", "parents": [ "b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2", "c2cdf6aba0dfcfb54be646ab630c1bccd180e890" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 15:46:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 03 15:46:37 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/macio: Fix probing of macio devices by using the right of match table\n agp/uninorth: Fix oops caused by flushing too much\n powerpc/pasemi: Update MAINTAINERS file\n powerpc/cell: Fix integer constant warning\n powerpc/kprobes: Remove resume_execution() in kprobes\n powerpc/macio: Don\u0027t dereference pointer before null check\n" }, { "commit": "4f4aeb7fd0f7e6ca008bb2147ba36cee13876595", "tree": "48f77ea91413ac36fc6ce72bf15249da6586b04e", "parents": [ "a1868dc2878e61778b9d6d8c61d5368e51d68a29", "51a0d38de26226f2779912d92f155b93d539da9a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 03 12:30:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 03 12:30:58 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" } ], "next": "a1868dc2878e61778b9d6d8c61d5368e51d68a29" }