)]}' { "log": [ { "commit": "b7013d0a16b881481dc25ba4d42c5203bebe5ff1", "tree": "914b66c3d7f5ea27f29919fdb0204641773407df", "parents": [ "3993b24649773080897fde524ea2d9f311eba2aa" ], "author": { "name": "Jeff Layton", "email": "jlayton@redhat.com", "time": "Mon Jun 11 10:03:42 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Jun 22 11:36:55 2012 -0700" }, "message": "rpc_pipefs: allow rpc_purge_list to take a NULL waitq pointer\n\ncommit 92123e068efa310b09e9943ac1cfd10ff6b6d2e4 upstream.\n\nIn the event that we don\u0027t have a dentry for a rpc_pipefs pipe, we still\nneed to allow the queue_timeout job to clean out the queue. There\u0027s just\nno waitq to wake up in that event.\n\nReported-by: Hans de Bruin \u003cjmdebruin@xmsnet.nl\u003e\nReported-by: Joerg Platte \u003cjplatte@naasa.net\u003e\nSigned-off-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "5f1d81e9fb6c05e8ab89a610bb63cdc8f0f66d81", "tree": "9c962613c1c1f124f9d0f8e132368c7060f05a47", "parents": [ "c7aa88da6b435fb45b01fe6076caf73ee6e529ae" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 31 15:26:38 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Jun 22 11:36:54 2012 -0700" }, "message": "NFSv4.1: Fix a request leak on the back channel\n\ncommit b3b02ae5865c2dcd506322e0fc6def59a042e72f upstream.\n\nIf the call to svc_process_common() fails, then the request\nneeds to be freed before we can exit bc_svc_process.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "6fa9c3400dd4cbf30c597dbde5d6abbc12b9764d", "tree": "1cbf564c7a00c82b62915b3341b83c59f950aa00", "parents": [ "a6382a8c4d9287ddca721edf622100e33c4546b9" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jun 05 12:16:50 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 17 11:21:26 2012 -0700" }, "message": "cfg80211: fix interface combinations check\n\ncommit 463454b5dbd8dbab6e2fc6c557329e5b811b9c32 upstream.\n\nIf a given interface combination doesn\u0027t contain\na required interface type then we missed checking\nthat and erroneously allowed it even though iface\ntype wasn\u0027t there at all. Add a check that makes\nsure that all interface types are accounted for.\n\nReported-by: Mohammed Shafi Shajakhan \u003cmohammed@qca.qualcomm.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "073e100877a39f36163398cde868e98fa6d3f0a1", "tree": "def5d17b06e3a4fd0688783568fc82d4dfd6c855", "parents": [ "d4bb7f49f4d5ea7a287899178df55b4725bb32d2" ], "author": { "name": "Arik Nemtsov", "email": "arik@wizery.com", "time": "Sun Jun 03 23:32:32 2012 +0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 17 11:21:25 2012 -0700" }, "message": "mac80211: fix non RCU-safe sta_list manipulation\n\ncommit 794454ce72a298de6f4536ade597bdcc7dcde7c7 upstream.\n\nsta_info_cleanup locks the sta_list using rcu_read_lock however\nthe delete operation isn\u0027t rcu safe. A race between sta_info_cleanup\ntimer being called and a STA being removed can occur which leads\nto a panic while traversing sta_list. Fix this by switching to the\nRCU-safe versions.\n\nReported-by: Eyal Shapira \u003ceyal@wizery.com\u003e\nSigned-off-by: Arik Nemtsov \u003carik@wizery.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "d4bb7f49f4d5ea7a287899178df55b4725bb32d2", "tree": "c64f85367ff571a42d3a5fcb76c871a9632463a1", "parents": [ "721632c39add11e5d5fa5dd8b956dcae63d02b17" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu May 31 15:09:27 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 17 11:21:25 2012 -0700" }, "message": "mac80211: clean up remain-on-channel on interface stop\n\ncommit 71ecfa1893034eeb1c93e02e22ee2ad26d080858 upstream.\n\nWhen any interface goes down, it could be the one that we\nwere doing a remain-on-channel with. We therefore need to\ncancel the remain-on-channel and flush the related work\nstructs so they don\u0027t run after the interface has been\nremoved or even destroyed.\n\nIt\u0027s also possible in this case that an off-channel SKB\nwas never transmitted, so free it if this is the case.\nNote that this can also happen if the driver finishes\nthe off-channel period without ever starting it.\n\nReported-by: Nirav Shah \u003cnirav.j2.shah@intel.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "721632c39add11e5d5fa5dd8b956dcae63d02b17", "tree": "d08b6f48769a2c944ecb82eb580703de0a4ec813", "parents": [ "f4c3d440c898725132291e5171b3244c2027c30e" ], "author": { "name": "Meenakshi Venkataraman", "email": "meenakshi.venkataraman@intel.com", "time": "Wed May 30 11:39:33 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 17 11:21:25 2012 -0700" }, "message": "mac80211: fix error in station state transitions during reconfig\n\ncommit bd34ab62a3297bd7685da11b0cbe05ae4cd8b02c upstream.\n\nAs part of hardware reconfig mac80211 tries\nto restore the station state to its values\nbefore the hardware reconfig, but it only\ngoes to the last-state - 1. Fix this\noff-by-one error.\n\nSigned-off-by: Meenakshi Venkataraman \u003cmeenakshi.venkataraman@intel.com\u003e\nReviewed-by: Emmanuel Grumbach \u003cemmanuel.grumbach@intel.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "978041f2a946a4616f7cdb60f6d453ffa83298c1", "tree": "e5ced0504c3986e77add058bf1923cfe7b7449b2", "parents": [ "010589e2bce841733dc989fd56c5c3aba41a759c" ], "author": { "name": "Benjamin Poirier", "email": "bpoirier@suse.de", "time": "Thu May 24 11:32:38 2012 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:15 2012 +0900" }, "message": "xfrm: take net hdr len into account for esp payload size calculation\n\n[ Upstream commit 91657eafb64b4cb53ec3a2fbc4afc3497f735788 ]\n\nCorrects the function that determines the esp payload size. The calculations\ndone in esp{4,6}_get_mtu() lead to overlength frames in transport mode for\ncertain mtu values and suboptimal frames for others.\n\nAccording to what is done, mainly in esp{,6}_output() and tcp_mtu_to_mss(),\nnet_header_len must be taken into account before doing the alignment\ncalculation.\n\nSigned-off-by: Benjamin Poirier \u003cbpoirier@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "ea1ae37f4a2c41ea684f2e725332147eb6496026", "tree": "69bc053d76f9982f49ea7231877bb0d8738cd412", "parents": [ "be078c8003469b75aa9119254c163b2961321744" ], "author": { "name": "James Chapman", "email": "jchapman@katalix.com", "time": "Tue May 29 23:13:23 2012 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:15 2012 +0900" }, "message": "l2tp: fix oops in L2TP IP sockets for connect() AF_UNSPEC case\n\n[ Upstream commit c51ce49735c183ef2592db70f918ee698716276b ]\n\nAn application may call connect() to disconnect a socket using an\naddress with family AF_UNSPEC. The L2TP IP sockets were not handling\nthis case when the socket is not bound and an attempt to connect()\nusing AF_UNSPEC in such cases would result in an oops. This patch\naddresses the problem by protecting the sk_prot-\u003edisconnect() call\nagainst trying to unhash the socket before it is bound.\n\nThe patch also adds more checks that the sockaddr supplied to bind()\nand connect() calls is valid.\n\n RIP: 0010:[\u003cffffffff82e133b0\u003e] [\u003cffffffff82e133b0\u003e] inet_unhash+0x50/0xd0\n RSP: 0018:ffff88001989be28 EFLAGS: 00010293\n Stack:\n ffff8800407a8000 0000000000000000 ffff88001989be78 ffffffff82e3a249\n ffffffff82e3a050 ffff88001989bec8 ffff88001989be88 ffff8800407a8000\n 0000000000000010 ffff88001989bec8 ffff88001989bea8 ffffffff82e42639\n Call Trace:\n [\u003cffffffff82e3a249\u003e] udp_disconnect+0x1f9/0x290\n [\u003cffffffff82e42639\u003e] inet_dgram_connect+0x29/0x80\n [\u003cffffffff82d012fc\u003e] sys_connect+0x9c/0x100\n\nReported-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "be078c8003469b75aa9119254c163b2961321744", "tree": "a0aab8f217d0a956633a0e81fb6008ee8cd3f8e3", "parents": [ "86a2569c810dff80fc7ba16dd77bc2697c28317a" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Sat May 26 01:30:53 2012 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:15 2012 +0900" }, "message": "ipv6: fix incorrect ipsec fragment\n\n[ Upstream commit 0c1833797a5a6ec23ea9261d979aa18078720b74 ]\n\nSince commit ad0081e43a\n\"ipv6: Fragment locally generated tunnel-mode IPSec6 packets as needed\"\nthe fragment of packets is incorrect.\nbecause tunnel mode needs IPsec headers and trailer for all fragments,\nwhile on transport mode it is sufficient to add the headers to the\nfirst fragment and the trailer to the last.\n\nso modify mtu and maxfraglen base on ipsec mode and if fragment is first\nor last.\n\nwith my test,it work well(every fragment\u0027s size is the mtu)\nand does not trigger slow fragment path.\n\nChanges from v1:\n\tthough optimization, mtu_prev and maxfraglen_prev can be delete.\n\treplace xfrm mode codes with dst_entry\u0027s new frag DST_XFRM_TUNNEL.\n\tadd fuction ip6_append_data_mtu to make codes clearer.\n\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "86a2569c810dff80fc7ba16dd77bc2697c28317a", "tree": "d1203a61268fcd098263d94013d45b63853745ae", "parents": [ "630ec1481b8aa0f6f66d521f04feacd74bfc19f5" ], "author": { "name": "Yanmin Zhang", "email": "yanmin_zhang@linux.intel.com", "time": "Wed May 23 15:39:45 2012 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:14 2012 +0900" }, "message": "ipv4: fix the rcu race between free_fib_info and ip_route_output_slow\n\n[ Upstream commit e49cc0da7283088c5e03d475ffe2fdcb24a6d5b1 ]\n\nWe hit a kernel OOPS.\n\n\u003c3\u003e[23898.789643] BUG: sleeping function called from invalid context at\n/data/buildbot/workdir/ics/hardware/intel/linux-2.6/arch/x86/mm/fault.c:1103\n\u003c3\u003e[23898.862215] in_atomic(): 0, irqs_disabled(): 0, pid: 10526, name:\nThread-6683\n\u003c4\u003e[23898.967805] HSU serial 0000:00:05.1: 0000:00:05.2:HSU serial prevented me\nto suspend...\n\u003c4\u003e[23899.258526] Pid: 10526, comm: Thread-6683 Tainted: G W\n3.0.8-137685-ge7742f9 #1\n\u003c4\u003e[23899.357404] HSU serial 0000:00:05.1: 0000:00:05.2:HSU serial prevented me\nto suspend...\n\u003c4\u003e[23899.904225] Call Trace:\n\u003c4\u003e[23899.989209] [\u003cc1227f50\u003e] ? pgtable_bad+0x130/0x130\n\u003c4\u003e[23900.000416] [\u003cc1238c2a\u003e] __might_sleep+0x10a/0x110\n\u003c4\u003e[23900.007357] [\u003cc1228021\u003e] do_page_fault+0xd1/0x3c0\n\u003c4\u003e[23900.013764] [\u003cc18e9ba9\u003e] ? restore_all+0xf/0xf\n\u003c4\u003e[23900.024024] [\u003cc17c007b\u003e] ? napi_complete+0x8b/0x690\n\u003c4\u003e[23900.029297] [\u003cc1227f50\u003e] ? pgtable_bad+0x130/0x130\n\u003c4\u003e[23900.123739] [\u003cc1227f50\u003e] ? pgtable_bad+0x130/0x130\n\u003c4\u003e[23900.128955] [\u003cc18ea0c3\u003e] error_code+0x5f/0x64\n\u003c4\u003e[23900.133466] [\u003cc1227f50\u003e] ? pgtable_bad+0x130/0x130\n\u003c4\u003e[23900.138450] [\u003cc17f6298\u003e] ? __ip_route_output_key+0x698/0x7c0\n\u003c4\u003e[23900.144312] [\u003cc17f5f8d\u003e] ? __ip_route_output_key+0x38d/0x7c0\n\u003c4\u003e[23900.150730] [\u003cc17f63df\u003e] ip_route_output_flow+0x1f/0x60\n\u003c4\u003e[23900.156261] [\u003cc181de58\u003e] ip4_datagram_connect+0x188/0x2b0\n\u003c4\u003e[23900.161960] [\u003cc18e981f\u003e] ? _raw_spin_unlock_bh+0x1f/0x30\n\u003c4\u003e[23900.167834] [\u003cc18298d6\u003e] inet_dgram_connect+0x36/0x80\n\u003c4\u003e[23900.173224] [\u003cc14f9e88\u003e] ? _copy_from_user+0x48/0x140\n\u003c4\u003e[23900.178817] [\u003cc17ab9da\u003e] sys_connect+0x9a/0xd0\n\u003c4\u003e[23900.183538] [\u003cc132e93c\u003e] ? alloc_file+0xdc/0x240\n\u003c4\u003e[23900.189111] [\u003cc123925d\u003e] ? sub_preempt_count+0x3d/0x50\n\nFunction free_fib_info resets nexthop_nh-\u003enh_dev to NULL before releasing\nfi. Other cpu might be accessing fi. Fixing it by delaying the releasing.\n\nWith the patch, we ran MTBF testing on Android mobile for 12 hours\nand didn\u0027t trigger the issue.\n\nThank Eric for very detailed review/checking the issue.\n\nSigned-off-by: Yanmin Zhang \u003cyanmin_zhang@linux.intel.com\u003e\nSigned-off-by: Kun Jiang \u003ckunx.jiang@intel.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "c7faf5bbaeba30053627de3b333d3c17e051ba80", "tree": "b64389cc38ef5aac36ce7dff7e084aaf3738ffd9", "parents": [ "7a0786dcc32e5d16721449d43cfb90d7869d08ea" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Sat May 19 12:12:53 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:09 2012 +0900" }, "message": "sunrpc: fix loss of task-\u003etk_status after rpc_delay call in xprt_alloc_slot\n\ncommit 1afeaf5c29aa07db25760d2fbed5c08a3aec3498 upstream.\n\nxprt_alloc_slot will call rpc_delay() to make the task wait a bit before\nretrying when it gets back an -ENOMEM error from xprt_dynamic_alloc_slot.\nThe problem is that rpc_delay will clear the task-\u003etk_status, causing\ncall_reserveresult to abort the task.\n\nThe solution is simply to let call_reserveresult handle the ENOMEM error\ndirectly.\n\nReported-by: Jeff Layton \u003cjlayton@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "74b31d2a64a49ce8dbf8620eba0a116a892d4d0b", "tree": "b4f7668cd6ca9d596c048d753709feba81d6a746", "parents": [ "6ea90b39f492460884b218ffe066210f129771fb" ], "author": { "name": "Eyal Shapira", "email": "eyal@wizery.com", "time": "Tue May 29 02:00:22 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 10 00:36:08 2012 +0900" }, "message": "mac80211: fix ADDBA declined after suspend with wowlan\n\ncommit 7b21aea04d084916ac4e0e8852dcc9cd60ec0d1d upstream.\n\nWLAN_STA_BLOCK_BA is set while suspending but doesn\u0027t get cleared\nwhen resuming in case of wowlan. This causes further ADDBA requests\nreceived to be rejected. Fix it by clearing it in the wowlan path\nas well.\n\nSigned-off-by: Eyal Shapira \u003ceyal@wizery.com\u003e\nReviewed-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "4c68b0f805f759fa0c61b9bbfb2ca0324b00cbd3", "tree": "73bbb013824697cbff46bd567a9a99dbcea544af", "parents": [ "64126fa12b904d5dae0b7e33fac540c46faf67c5" ], "author": { "name": "Luis R. Rodriguez", "email": "mcgrof@frijolero.org", "time": "Fri Mar 23 07:23:31 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Jun 01 15:18:14 2012 +0800" }, "message": "cfg80211: warn if db.txt is empty with CONFIG_CFG80211_INTERNAL_REGDB\n\ncommit 80007efeff0568375b08faf93c7aad65602cb97e upstream.\n\nIt has happened twice now where elaborate troubleshooting has\nundergone on systems where CONFIG_CFG80211_INTERNAL_REGDB [0]\nhas been set but yet net/wireless/db.txt was not updated.\n\nDespite the documentation on this it seems system integrators could\nuse some more help with this, so throw out a kernel warning at boot time\nwhen their database is empty.\n\nThis does mean that the error-prone system integrator won\u0027t likely\nrealize the issue until they boot the machine but -- it does not seem\nto make sense to enable a build bug breaking random build testing.\n\n[0] http://wireless.kernel.org/en/developers/Regulatory/CRDA#CONFIG_CFG80211_INTERNAL_REGDB\n\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Youngsin Lee \u003cyoungsin@qualcomm.com\u003e\nCc: Raja Mani \u003crmani@qca.qualcomm.com\u003e\nCc: Senthil Kumar Balasubramanian \u003csenthilb@qca.qualcomm.com\u003e\nCc: Vipin Mehta \u003cvipimeht@qca.qualcomm.com\u003e\nCc: yahuan@qca.qualcomm.com\nCc: jjan@qca.qualcomm.com\nCc: vthiagar@qca.qualcomm.com\nCc: henrykim@qualcomm.com\nCc: jouni@qca.qualcomm.com\nCc: athiruve@qca.qualcomm.com\nCc: cjkim@qualcomm.com\nCc: philipk@qca.qualcomm.com\nCc: sunnykim@qualcomm.com\nCc: sskwak@qualcomm.com\nCc: kkim@qualcomm.com\nCc: mattbyun@qualcomm.com\nCc: ryanlee@qualcomm.com\nCc: simbap@qualcomm.com\nCc: krislee@qualcomm.com\nCc: conner@qualcomm.com\nCc: hojinkim@qualcomm.com\nCc: honglee@qualcomm.com\nCc: johnwkim@qualcomm.com\nCc: jinyong@qca.qualcomm.com\nSigned-off-by: Luis R. Rodriguez \u003cmcgrof@frijolero.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "d4b1133558e0d417342d5d2c49e4c35b428ff20d", "tree": "8d50b39901dbcd06d181ad505f7aff76ca9388d7", "parents": [ "42ea7d7f2a7356962022cdd124d9043c488ca5e2" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu May 17 23:52:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 18 13:54:33 2012 -0400" }, "message": "pktgen: fix module unload for good\n\ncommit c57b5468406 (pktgen: fix crash at module unload) did a very poor\njob with list primitives.\n\n1) list_splice() arguments were in the wrong order\n\n2) list_splice(list, head) has undefined behavior if head is not\ninitialized.\n\n3) We should use the list_splice_init() variant to clear pktgen_threads\nlist.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bad115cfe5b509043b684d3a007ab54b80090aa1", "tree": "f2da25538f8fcf48ae7a74b3b040d58628b52094", "parents": [ "1be5f0b7575e090fd100a98b303860879b5800de" ], "author": { "name": "Willy Tarreau", "email": "w@1wt.eu", "time": "Thu May 17 11:14:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 17 18:31:43 2012 -0400" }, "message": "tcp: do_tcp_sendpages() must try to push data out on oom conditions\n\nSince recent changes on TCP splicing (starting with commits 2f533844\n\"tcp: allow splice() to build full TSO packets\" and 35f9c09f \"tcp:\ntcp_sendpages() should call tcp_push() once\"), I started seeing\nmassive stalls when forwarding traffic between two sockets using\nsplice() when pipe buffers were larger than socket buffers.\n\nLatest changes (net: netdev_alloc_skb() use build_skb()) made the\nproblem even more apparent.\n\nThe reason seems to be that if do_tcp_sendpages() fails on out of memory\ncondition without being able to send at least one byte, tcp_push() is not\ncalled and the buffers cannot be flushed.\n\nAfter applying the attached patch, I cannot reproduce the stalls at all\nand the data rate it perfectly stable and steady under any condition\nwhich previously caused the problem to be permanent.\n\nThe issue seems to have been there since before the kernel migrated to\ngit, which makes me think that the stalls I occasionally experienced\nwith tux during stress-tests years ago were probably related to the\nsame issue.\n\nThis issue was first encountered on 3.0.31 and 3.2.17, so please backport\nto -stable.\n\nSigned-off-by: Willy Tarreau \u003cw@1wt.eu\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\n" }, { "commit": "26a5d3cc0b3d1ff23b5a94edb58226afe7f12a0c", "tree": "046834414e20d334fc5172275a53c55d9722a714", "parents": [ "769b0daf6e18a05a6d4da94baab7edd12867350c" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Mon May 14 01:47:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 16 15:38:49 2012 -0400" }, "message": "netfilter: ipset: fix hash size checking in kernel\n\nThe hash size must fit both into u32 (jhash) and the max value of\nsize_t. The missing checking could lead to kernel crash, bug reported\nby Seblu.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60374631487a6dbf6b888729022f0e8d76eec8fb", "tree": "4adda0d1a8616ce586ea26a25717477c9e18667a", "parents": [ "8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b", "671267bf3aac3dae0555730b07ef29c042e325b2" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 15 16:38:00 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 15 16:38:00 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "671267bf3aac3dae0555730b07ef29c042e325b2", "tree": "89ee980737493ce6247b3a454636e48bd488e1c7", "parents": [ "a7d7723ae7c0178d715c06c5621e8fd8014ba92f" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Sat May 12 16:11:50 2012 -0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 14 13:56:15 2012 -0400" }, "message": "Bluetooth: mgmt: Fix device_connected sending order\n\nThe mgmt_ev_device_connected signal must be sent before any event\nindications happen for sockets associated with the connection. Otherwise\ne.g. device authorization for the sockets will fail with ENOTCONN as\nuser space things that there is no baseband link.\n\nThis patch fixes the issue by ensuring that the device_connected event\nif sent (if it hasn\u0027t been so already) as soon as the first ACL data\npacket arrives from the remote device.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a7d7723ae7c0178d715c06c5621e8fd8014ba92f", "tree": "8e09cd37ed267e792481c2ad699bcaff9596e5e7", "parents": [ "574e02abaf816b582685805f0c1150ca9f1f18ee" ], "author": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Sun May 13 03:20:07 2012 -0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon May 14 13:51:25 2012 -0400" }, "message": "Bluetooth: notify userspace of security level change\n\nIt fixes L2CAP socket based security level elevation during a\nconnection. The HID profile needs this (for keyboards) and it is the only\nway to achieve the security level elevation when using the management\ninterface to talk to the kernel (hence the management enabling patch\nbeing the one that exposes this issue).\n\nIt enables the userspace a security level change when the socket is\nalready connected and create a way to notify the socket the result of the\nrequest. At the moment of the request the socket is made non writable, if\nthe request fails the connections closes, otherwise the socket is made\nwritable again, POLL_OUT is emmited.\n\nSigned-off-by: Gustavo Padovan \u003cgustavo@padovan.org\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8aa51d64c1f526e43b1e7f89fb8b98c2fd583f4b", "tree": "8444efa46bbd8dbe4e01655aaa719d8d5257928e", "parents": [ "b99215cdc6e191f5649687536d4fb0faa3d7f56e" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Sun May 13 08:44:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun May 13 15:47:34 2012 -0400" }, "message": "openvswitch: checking wrong variable in queue_userspace_packet()\n\n\"skb\" is non-NULL here, for example we dereference it in skb_clone().\nThe intent was to test \"nskb\" which was just set.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4a873f53995cd551587ee4aad1e6f189a330ff36", "tree": "a1caacf532d6a32861399720ae2883396f443954", "parents": [ "2eb429671a4b83ea34a1a722a4656bb14ce7c971", "062e55e3960062fc2fb62a7274b4c253003eba73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 12 12:57:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 12 12:57:01 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David S. Miller:\n\n 1) Since we do RCU lookups on ipv4 FIB entries, we have to test if the\n entry is dead before returning it to our caller.\n\n 2) openvswitch locking and packet validation fixes from Ansis Atteka,\n Jesse Gross, and Pravin B Shelar.\n\n 3) Fix PM resume locking in IGB driver, from Benjamin Poirier.\n\n 4) Fix VLAN header handling in vhost-net and macvtap, from Basil Gor.\n\n 5) Revert a bogus network namespace isolation change that was causing\n regressions on S390 networking devices.\n\n 6) If bonding decides to process and handle a LACPDU frame, we\n shouldn\u0027t bump the rx_dropped counter. From Jiri Bohac.\n\n 7) Fix mis-calculation of available TX space in r8169 driver when doing\n TSO, which can lead to crashes and/or hung device. From Julien\n Ducourthial.\n\n 8) SCTP does not validate cached routes properly in all cases, from\n Nicolas Dichtel.\n\n 9) Link status interrupt needs to be handled in ks8851 driver, from\n Stephen Boyd.\n\n10) Use capable(), not cap_raised(), in connector/userns netlink code.\n From Eric W. Biederman via Andrew Morton.\n\n11) Fix pktgen OOPS on module unload, from Eric Dumazet.\n\n12) iwlwifi under-estimates SKB truesizes, also from Eric Dumazet.\n\n13) Cure division by zero in SFC driver, from Ben Hutchings.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)\n ks8851: Update link status during link change interrupt\n macvtap: restore vlan header on user read\n vhost-net: fix handle_rx buffer size\n bonding: don\u0027t increase rx_dropped after processing LACPDUs\n connector/userns: replace netlink uses of cap_raised() with capable()\n sctp: check cached dst before using it\n pktgen: fix crash at module unload\n Revert \"net: maintain namespace isolation between vlan and real device\"\n ehea: fix losing of NEQ events when one event occurred early\n igb: fix rtnl race in PM resume path\n ipv4: Do not use dead fib_info entries.\n r8169: fix unsigned int wraparound with TSO\n sfc: Fix division by zero when using one RX channel and no SR-IOV\n openvswitch: Validation of IPv6 set port action uses IPv4 header\n net: compare_ether_addr[_64bits]() has no ordering\n cdc_ether: Ignore bogus union descriptor for RNDIS devices\n bnx2x: bug fix when loading after SAN boot\n e1000: Silence sparse warnings by correcting type\n igb, ixgbe: netdev_tx_reset_queue incorrectly called from tx init path\n openvswitch: Release rtnl_lock if ovs_vport_cmd_build_info() failed.\n ...\n" }, { "commit": "e0268868ba064980488fc8c194db3d8e9fb2959c", "tree": "7b8bfb4cceb0a5d184a2fe651aab5aec59a216d3", "parents": [ "c57b54684060c8aced64a5b78ff69ff289af97b9" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Fri May 04 05:24:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:15:47 2012 -0400" }, "message": "sctp: check cached dst before using it\n\ndst_check() will take care of SA (and obsolete field), hence\nIPsec rekeying scenario is taken into account.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nAcked-by: Vlad Yaseivch \u003cvyasevich@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c57b54684060c8aced64a5b78ff69ff289af97b9", "tree": "910e52b177da527183ddf4c29ccd90392b3039e3", "parents": [ "59b9997baba5242997ddc7bd96b1391f5275a5a4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed May 09 13:29:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:10:24 2012 -0400" }, "message": "pktgen: fix crash at module unload\n\ncommit 7d3d43dab4e9 (net: In unregister_netdevice_notifier unregister\nthe netdevices.) makes pktgen crashing at module unload.\n\n[ 296.820578] BUG: spinlock bad magic on CPU#6, rmmod/3267\n[ 296.820719] lock: ffff880310c38000, .magic: ffff8803, .owner: \u003cnone\u003e/-1, .owner_cpu: -1\n[ 296.820943] Pid: 3267, comm: rmmod Not tainted 3.4.0-rc5+ #254\n[ 296.821079] Call Trace:\n[ 296.821211] [\u003cffffffff8168a715\u003e] spin_dump+0x8a/0x8f\n[ 296.821345] [\u003cffffffff8168a73b\u003e] spin_bug+0x21/0x26\n[ 296.821507] [\u003cffffffff812b4741\u003e] do_raw_spin_lock+0x131/0x140\n[ 296.821648] [\u003cffffffff8169188e\u003e] _raw_spin_lock+0x1e/0x20\n[ 296.821786] [\u003cffffffffa00cc0fd\u003e] __pktgen_NN_threads+0x4d/0x140 [pktgen]\n[ 296.821928] [\u003cffffffffa00ccf8d\u003e] pktgen_device_event+0x10d/0x1e0 [pktgen]\n[ 296.822073] [\u003cffffffff8154ed4f\u003e] unregister_netdevice_notifier+0x7f/0x100\n[ 296.822216] [\u003cffffffffa00d2a0b\u003e] pg_cleanup+0x48/0x73 [pktgen]\n[ 296.822357] [\u003cffffffff8109528e\u003e] sys_delete_module+0x17e/0x2a0\n[ 296.822502] [\u003cffffffff81699652\u003e] system_call_fastpath+0x16/0x1b\n\nHold the pktgen_thread_lock while splicing pktgen_threads, and test\npktgen_exiting in pktgen_device_event() to make unload faster.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "59b9997baba5242997ddc7bd96b1391f5275a5a4", "tree": "eaef6c0eff50403fcf871cdd4b7c4afa605f0541", "parents": [ "380ec964bc19f865af70c0339dff1cb75dc4f8f2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:03:34 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 23:03:34 2012 -0400" }, "message": "Revert \"net: maintain namespace isolation between vlan and real device\"\n\nThis reverts commit 8a83a00b0735190384a348156837918271034144.\n\nIt causes regressions for S390 devices, because it does an\nunconditional DST drop on SKBs for vlans and the QETH device\nneeds the neighbour entry hung off the DST for certain things\non transmit.\n\nArnd can\u0027t remember exactly why he even needed this change.\n\nConflicts:\n\n\tdrivers/net/macvlan.c\n\tnet/8021q/vlan_dev.c\n\tnet/core/dev.c\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dccd9ecc374462e5d6a5b8f8110415a86c2213d8", "tree": "92985101d752308885e7b29678dc9845eabea0d6", "parents": [ "0e0c55165b638e96c8d7097ea638aa368daa268a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 22:16:32 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu May 10 22:16:32 2012 -0400" }, "message": "ipv4: Do not use dead fib_info entries.\n\nDue to RCU lookups and RCU based release, fib_info objects can\nbe found during lookup which have fi-\u003efib_dead set.\n\nWe must ignore these entries, otherwise we risk dereferencing\nthe parts of the entry which are being torn down.\n\nReported-by: Yevgen Pronenko \u003cyevgen.pronenko@sonymobile.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc46f9375a286d05f84a9464efc2b7f1f5614ff4", "tree": "8d7959826a254bbc51a5ad6d292d5d67d82dbacb", "parents": [ "ed3ac021e5038696fd38670e83219cea487f66be", "7bdf7415a6b8ec31f86b3ad3eaa241257ecb7c4c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 10:05:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 10 10:05:19 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-5\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull a NFS client bugfix from Trond Myklebust:\n \"Fix for the NFSv4 security negotiation: ensure that the security\n negotiation tries all registered security flavours\"\n\n* tag \u0027nfs-for-3.4-5\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n auth_gss: the list of pseudoflavors not being parsed correctly\n" }, { "commit": "c5baa80ac879a3b38314f434c0a7255a2c2e4c86", "tree": "47b7f9e7ecedeacdcdcdbf89ac63b1d0093eebb6", "parents": [ "1c430a727fa512500a422ffe4712166c550ea06a", "072ae6314a191e3a9fc309b1e4e539ac7abc48ad" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 08 19:31:32 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 08 19:31:32 2012 -0400" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch\n" }, { "commit": "072ae6314a191e3a9fc309b1e4e539ac7abc48ad", "tree": "d4bdf8e5c538cb1351f1cc462e65654646af7e8d", "parents": [ "4cb6e116bb97c8b87a1f4f95e99d0c8dda2a6e9b" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Mon May 07 17:21:53 2012 -0700" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Mon May 07 17:23:10 2012 -0700" }, "message": "openvswitch: Validation of IPv6 set port action uses IPv4 header\n\nWhen the kernel validates set TCP/UDP port actions, it looks at\nthe ports in the existing flow to make sure that the L4 header exists.\nHowever, these actions always use the IPv4 version of the struct.\nFollowing patch fixes this by checking for flow ip protocol first.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "4cb6e116bb97c8b87a1f4f95e99d0c8dda2a6e9b", "tree": "071d9dfaa2cb307e0af570ae2455ce8deee9dbce", "parents": [ "bf32fecdc1851ad9ca960f56771b798d17c26cf1" ], "author": { "name": "Ansis Atteka", "email": "aatteka@nicira.com", "time": "Thu May 03 18:40:38 2012 -0700" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Thu May 03 18:40:38 2012 -0700" }, "message": "openvswitch: Release rtnl_lock if ovs_vport_cmd_build_info() failed.\n\nThis patch fixes a possible lock-up bug where rtnl_lock might not\nget released.\n\nSigned-off-by: Ansis Atteka \u003caatteka@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "c42f1d4b523950c4af060f8fc0c7016755d8a3bc", "tree": "8322c9c14b0c7055ce924d12c1150d2acb0ea95e", "parents": [ "913a90416918a591e6d5ece036b795c58a08131d", "5a8887d39e1ba5ee2d4ccb94b14d6f2dce5ddfca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 03 17:10:39 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Transfer padding was wrong for full-speed USB in ASIX driver, fix\n from Ingo van Lil.\n\n 2) Propagate the negative packet offset fix into the PowerPC BPF JIT.\n From Jan Seiffert.\n\n 3) dl2k driver\u0027s private ioctls were letting unprivileged tasks make\n MII writes and other ugly bits like that. Fix from Jeff Mahoney.\n\n 4) Fix TX VLAN and RX packet drops in ucc_geth, from Joakim Tjernlund.\n\n 5) OOPS and network namespace fixes in IPVS from Hans Schillstrom and\n Julian Anastasov.\n\n 6) Fix races and sleeping in locked context bugs in drop_monitor, from\n Neil Horman.\n\n 7) Fix link status indication in smsc95xx driver, from Paolo Pisati.\n\n 8) Fix bridge netfilter OOPS, from Peter Huang.\n\n 9) L2TP sendmsg can return on error conditions with the socket lock\n held, oops. Fix from Sasha Levin.\n\n10) udp_diag should return meaningful values for socket memory usage,\n from Shan Wei.\n\n11) Eric Dumazet is so awesome he gets his own section:\n\n Socket memory cgroup code (I never should have applied those\n patches, grumble...) made erroneous changes to\n sk_sockets_allocated_read_positive(). It was changed to\n use percpu_counter_sum_positive (which requires BH disabling)\n instead of percpu_counter_read_positive (which does not).\n Revert back to avoid crashes and lockdep warnings.\n\n Adjust the default tcp_adv_win_scale and tcp_rmem[2] values\n to fix throughput regressions. This is necessary as a result\n of our more precise skb-\u003etruesize tracking.\n\n Fix SKB leak in netem packet scheduler.\n\n12) New device IDs for various bluetooth devices, from Manoj Iyer,\n AceLan Kao, and Steven Harms.\n\n13) Fix command completion race in ipw2200, from Stanislav Yakovlev.\n\n14) Fix rtlwifi oops on unload, from Larry Finger.\n\n15) Fix hard_mtu when adjusting hard_header_len in smsc95xx driver.\n From Stephane Fillod.\n\n16) ehea driver registers it\u0027s IRQ before all the necessary state is\n setup, resulting in crashes. Fix from Thadeu Lima de Souza\n Cascardo.\n\n17) Fix PHY connection failures in davinci_emac driver, from Anatolij\n Gustschin.\n\n18) Missing break; in switch statement in bluetooth\u0027s\n hci_cmd_complete_evt(). Fix from Szymon Janc.\n\n19) Fix queue programming in iwlwifi, from Johannes Berg.\n\n20) Interrupt throttling defaults not being actually programmed into the\n hardware, fix from Jeff Kirsher and Ying Cai.\n\n21) TLAN driver SKB encoding in descriptor busted on 64-bit, fix from\n Benjamin Poirier.\n\n22) Fix blind status block RX producer pointer deref in TG3 driver, from\n Matt Carlson.\n\n23) Promisc and multicast are busted on ehea, fixes from Thadeu Lima de\n Souza Cascardo.\n\n24) Fix crashes in 6lowpan, from Alexander Smirnov.\n\n25) tcp_complete_cwr() needs to be careful to not rewind the CWND to\n ssthresh if ssthresh has the \"infinite\" value. Fix from Yuchung\n Cheng.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (81 commits)\n sungem: Fix WakeOnLan\n tcp: change tcp_adv_win_scale and tcp_rmem[2]\n net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg\n drop_monitor: prevent init path from scheduling on the wrong cpu\n usbnet: fix failure handling in usbnet_probe\n usbnet: fix leak of transfer buffer of dev-\u003einterrupt\n ucc_geth: Add 16 bytes to max TX frame for VLANs\n net: ucc_geth, increase no. of HW RX descriptors\n netem: fix possible skb leak\n sky2: fix receive length error in mixed non-VLAN/VLAN traffic\n sky2: propogate rx hash when packet is copied\n net: fix two typos in skbuff.h\n cxgb3: Don\u0027t call cxgb_vlan_mode until q locks are initialized\n ixgbe: fix calling skb_put on nonlinear skb assertion bug\n ixgbe: Fix a memory leak in IEEE DCB\n igbvf: fix the bug when initializing the igbvf\n smsc75xx: enable mac to detect speed/duplex from phy\n smsc75xx: declare smsc75xx\u0027s MII as GMII capable\n smsc75xx: fix phy interrupt acknowledge\n smsc75xx: fix phy init reset loop\n ...\n" }, { "commit": "7bdf7415a6b8ec31f86b3ad3eaa241257ecb7c4c", "tree": "36cabe5902b163a66f94d7971ddba72d9aeaf0ff", "parents": [ "3617e5031b3acec04efaa36566a8111ac8f07325" ], "author": { "name": "Steve Dickson", "email": "steved@redhat.com", "time": "Thu May 03 11:47:08 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Thu May 03 12:35:33 2012 -0400" }, "message": "auth_gss: the list of pseudoflavors not being parsed correctly\n\ngss_mech_list_pseudoflavors() parses a list of registered mechanisms.\nOn that list contains a list of pseudo flavors which was not being\nparsed correctly, causing only the first pseudo flavor to be found.\n\nSigned-off-by: Steve Dickson \u003csteved@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b49960a05e32121d29316cfdf653894b88ac9190", "tree": "101bb83073486809d5cc84505fecf772f4a77599", "parents": [ "84768edbb2721637620b2d84501bb0d5aed603f1" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed May 02 02:28:41 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 21:08:58 2012 -0400" }, "message": "tcp: change tcp_adv_win_scale and tcp_rmem[2]\n\ntcp_adv_win_scale default value is 2, meaning we expect a good citizen\nskb to have skb-\u003elen / skb-\u003etruesize ratio of 75% (3/4)\n\nIn 2.6 kernels we (mis)accounted for typical MSS\u003d1460 frame :\n1536 + 64 + 256 \u003d 1856 \u0027estimated truesize\u0027, and 1856 * 3/4 \u003d 1392.\nSo these skbs were considered as not bloated.\n\nWith recent truesize fixes, a typical MSS\u003d1460 frame truesize is now the\nmore precise :\n2048 + 256 \u003d 2304. But 2304 * 3/4 \u003d 1728.\nSo these skb are not good citizen anymore, because 1460 \u003c 1728\n\n(GRO can escape this problem because it build skbs with a too low\ntruesize.)\n\nThis also means tcp advertises a too optimistic window for a given\nallocated rcvspace : When receiving frames, sk_rmem_alloc can hit\nsk_rcvbuf limit and we call tcp_prune_queue()/tcp_collapse() too often,\nespecially when application is slow to drain its receive queue or in\ncase of losses (netperf is fast, scp is slow). This is a major latency\nsource.\n\nWe should adjust the len/truesize ratio to 50% instead of 75%\n\nThis patch :\n\n1) changes tcp_adv_win_scale default to 1 instead of 2\n\n2) increase tcp_rmem[2] limit from 4MB to 6MB to take into account\nbetter truesize tracking and to allow autotuning tcp receive window to\nreach same value than before. Note that same amount of kernel memory is\nconsumed compared to 2.6 kernels.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "84768edbb2721637620b2d84501bb0d5aed603f1", "tree": "6b62fcfca8398296c12e8ebbd37985295ce698e0", "parents": [ "4fdcfa12843bca38d0c9deff70c8720e4e8f515f" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Wed May 02 03:58:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 21:04:33 2012 -0400" }, "message": "net: l2tp: unlock socket lock before returning from l2tp_ip_sendmsg\n\nl2tp_ip_sendmsg could return without releasing socket lock, making it all the\nway to userspace, and generating the following warning:\n\n[ 130.891594] \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[ 130.894569] [ BUG: lock held when returning to user space! ]\n[ 130.897257] 3.4.0-rc5-next-20120501-sasha #104 Tainted: G W\n[ 130.900336] ------------------------------------------------\n[ 130.902996] trinity/8384 is leaving the kernel with locks still held!\n[ 130.906106] 1 lock held by trinity/8384:\n[ 130.907924] #0: (sk_lock-AF_INET){+.+.+.}, at: [\u003cffffffff82b9503f\u003e] l2tp_ip_sendmsg+0x2f/0x550\n\nIntroduced by commit 2f16270 (\"l2tp: Fix locking in l2tp_ip.c\").\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4fdcfa12843bca38d0c9deff70c8720e4e8f515f", "tree": "3ef2a92b1d6d322f9b72185e58b9d35a15564692", "parents": [ "a4723848d05dd31d298c551fb77ad28481309999" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Tue May 01 08:18:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 02 21:02:48 2012 -0400" }, "message": "drop_monitor: prevent init path from scheduling on the wrong cpu\n\nI just noticed after some recent updates, that the init path for the drop\nmonitor protocol has a minor error. drop monitor maintains a per cpu structure,\nthat gets initalized from a single cpu. Normally this is fine, as the protocol\nisn\u0027t in use yet, but I recently made a change that causes a failed skb\nallocation to reschedule itself . Given the current code, the implication is\nthat this workqueue reschedule will take place on the wrong cpu. If drop\nmonitor is used early during the boot process, its possible that two cpus will\naccess a single per-cpu structure in parallel, possibly leading to data\ncorruption.\n\nThis patch fixes the situation, by storing the cpu number that a given instance\nof this per-cpu data should be accessed from. In the case of a need for a\nreschedule, the cpu stored in the struct is assigned the rescheule, rather than\nthe currently executing cpu\n\nTested successfully by myself.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "076e7779c07c56c7fa593a28c71ea7432d0c7c95", "tree": "70a4227b5d898c1abf37ed5779b0cd6f29b471bc", "parents": [ "116a0fc31c6c9b8fc821be5a96e5bf0b43260131", "66f2c99af3d6f2d0aa1120884cf1c60613ef61c0" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 01 14:14:05 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 01 14:14:05 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "116a0fc31c6c9b8fc821be5a96e5bf0b43260131", "tree": "f4b8561387b34fd4eec9b8a2d599937b2375d741", "parents": [ "e072b3fad5f3915102c94628b4971f52ff99dd05" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sun Apr 29 09:08:22 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 01 13:40:48 2012 -0400" }, "message": "netem: fix possible skb leak\n\nskb_checksum_help(skb) can return an error, we must free skb in this\ncase. qdisc_drop(skb, sch) can also be feeded with a NULL skb (if\nskb_unshare() failed), so lets use this generic helper.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Stephen Hemminger \u003cshemminger@osdl.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66f2c99af3d6f2d0aa1120884cf1c60613ef61c0", "tree": "97742b014e6e85aabc03d84e7604ebf557d6a438", "parents": [ "4c1bcdb5a3354b250b82a67549f57ac27a3bb85f" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sun Apr 29 15:44:16 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Apr 30 14:40:05 2012 -0400" }, "message": "mac80211: fix AP mode EAP tx for VLAN stations\n\nEAP frames for stations in an AP VLAN are sent on the main AP interface\nto avoid race conditions wrt. moving stations.\nFor that to work properly, sta_info_get_bss must be used instead of\nsta_info_get when sending EAP packets.\nPreviously this was only done for cooked monitor injected packets, so\nthis patch adds a check for tx-\u003eskb-\u003eprotocol to the same place.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1cebce36d660c83bd1353e41f3e66abd4686f215", "tree": "cd82ebc7c67f3d67e4de202dd3dafbb347f2324c", "parents": [ "05be18241e83d2ac6b656c8f924e74b3998c173f" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Mon Apr 30 06:00:18 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:44:39 2012 -0400" }, "message": "tcp: fix infinite cwnd in tcp_complete_cwr()\n\nWhen the cwnd reduction is done, ssthresh may be infinite\nif TCP enters CWR via ECN or F-RTO. If cwnd is not undone, i.e.,\nundo_marker is set, tcp_complete_cwr() falsely set cwnd to the\ninfinite ssthresh value. The correct operation is to keep cwnd\nintact because it has been updated in ECN or F-RTO.\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5414fc12e32a0e0833ec61ba8be864c46cd19966", "tree": "ee196c526a87c126655624218969a191b60e365f", "parents": [ "3885ca785a3618593226687ced84f3f336dc3860", "6cf51852486af3d79f57bf46d00209a14244dbaa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:23:22 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 30 13:23:22 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net\n" }, { "commit": "cbbb34498f8b2b26cbdc79532c8a2ee5cd1e756a", "tree": "faa27244aed8ab803846f85944775b0976a1975d", "parents": [ "71dfc5fa5160bb73752f0731539404569a77faca" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Apr 30 11:52:40 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Apr 30 11:58:51 2012 -0400" }, "message": "SUNRPC: RPC client must use the current utsname hostname string\n\nNow that the rpc client is namespace aware, it needs to use the\nutsname of the process that created it instead of using the\ninit_utsname. Both rpc_new_client and rpc_clone_client need to\nbe fixed.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\n" }, { "commit": "6cf51852486af3d79f57bf46d00209a14244dbaa", "tree": "4d7d7e19422e412bf4cb22100306fece93b8d498", "parents": [ "8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Apr 27 02:00:50 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:36 2012 +0200" }, "message": "netfilter: xt_CT: fix wrong checking in the timeout assignment path\n\nThe current checking always succeeded. We have to check the first\ncharacter of the string to check that it\u0027s empty, thus, skipping\nthe timeout path.\n\nThis fixes the use of the CT target without the timeout option.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "8537de8a7ab6681cc72fb0411ab1ba7fdba62dd0", "tree": "7a57ad6ef5aa0147dd13bba8be9bd77ab60f3f50", "parents": [ "582b8e3eadaec77788c1aa188081a8d5059c42a6" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Thu Apr 26 07:47:44 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:35 2012 +0200" }, "message": "ipvs: kernel oops - do_ip_vs_get_ctl\n\nChange order of init so netns init is ready\nwhen register ioctl and netlink.\n\nVer2\n\tWhitespace fixes and __init added.\n\nReported-by: \"Ryan O\u0027Hara\" \u003crohara@redhat.com\u003e\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "582b8e3eadaec77788c1aa188081a8d5059c42a6", "tree": "57f869aac66f51e56499c06027c7d1055285600b", "parents": [ "4b984cd50bc1b6d492175cd77bfabb78e76ffa67" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Thu Apr 26 09:45:35 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:35 2012 +0200" }, "message": "ipvs: take care of return value from protocol init_netns\n\nip_vs_create_timeout_table() can return NULL\nAll functions protocol init_netns is affected of this patch.\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "4b984cd50bc1b6d492175cd77bfabb78e76ffa67", "tree": "f338dce013046c295f177ad190cd5c88040ee8cf", "parents": [ "39f618b4fd95ae243d940ec64c961009c74e3333" ], "author": { "name": "Hans Schillstrom", "email": "hans.schillstrom@ericsson.com", "time": "Thu Apr 26 09:45:34 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Apr 30 10:40:14 2012 +0200" }, "message": "ipvs: null check of net-\u003eipvs in lblc(r) shedulers\n\nAvoid crash when registering shedulers after\nthe IPVS core initialization for netns fails. Do this by\nchecking for present core (net-\u003eipvs).\n\nSigned-off-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "3885ca785a3618593226687ced84f3f336dc3860", "tree": "a6b5af980c1295aaeee69749d4d79d47e072321a", "parents": [ "cde2e9a651b76d8db36ae94cd0febc82b637e5dd" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Apr 27 10:11:49 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 28 02:18:48 2012 -0400" }, "message": "drop_monitor: Make updating data-\u003eskb smp safe\n\nEric Dumazet pointed out to me that the drop_monitor protocol has some holes in\nits smp protections. Specifically, its possible to replace data-\u003eskb while its\nbeing written. This patch corrects that by making data-\u003eskb an rcu protected\nvariable. That will prevent it from being overwritten while a tracepoint is\nmodifying it.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cde2e9a651b76d8db36ae94cd0febc82b637e5dd", "tree": "f38ea38cdde763a3a1d86412478dbcc9df892412", "parents": [ "651913ce9de2bbcedef608c5d6cf39c244248509" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Apr 27 10:11:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 28 02:18:48 2012 -0400" }, "message": "drop_monitor: fix sleeping in invalid context warning\n\nEric Dumazet pointed out this warning in the drop_monitor protocol to me:\n\n[ 38.352571] BUG: sleeping function called from invalid context at kernel/mutex.c:85\n[ 38.352576] in_atomic(): 1, irqs_disabled(): 0, pid: 4415, name: dropwatch\n[ 38.352580] Pid: 4415, comm: dropwatch Not tainted 3.4.0-rc2+ #71\n[ 38.352582] Call Trace:\n[ 38.352592] [\u003cffffffff8153aaf0\u003e] ? trace_napi_poll_hit+0xd0/0xd0\n[ 38.352599] [\u003cffffffff81063f2a\u003e] __might_sleep+0xca/0xf0\n[ 38.352606] [\u003cffffffff81655b16\u003e] mutex_lock+0x26/0x50\n[ 38.352610] [\u003cffffffff8153aaf0\u003e] ? trace_napi_poll_hit+0xd0/0xd0\n[ 38.352616] [\u003cffffffff810b72d9\u003e] tracepoint_probe_register+0x29/0x90\n[ 38.352621] [\u003cffffffff8153a585\u003e] set_all_monitor_traces+0x105/0x170\n[ 38.352625] [\u003cffffffff8153a8ca\u003e] net_dm_cmd_trace+0x2a/0x40\n[ 38.352630] [\u003cffffffff8154a81a\u003e] genl_rcv_msg+0x21a/0x2b0\n[ 38.352636] [\u003cffffffff810f8029\u003e] ? zone_statistics+0x99/0xc0\n[ 38.352640] [\u003cffffffff8154a600\u003e] ? genl_rcv+0x30/0x30\n[ 38.352645] [\u003cffffffff8154a059\u003e] netlink_rcv_skb+0xa9/0xd0\n[ 38.352649] [\u003cffffffff8154a5f0\u003e] genl_rcv+0x20/0x30\n[ 38.352653] [\u003cffffffff81549a7e\u003e] netlink_unicast+0x1ae/0x1f0\n[ 38.352658] [\u003cffffffff81549d76\u003e] netlink_sendmsg+0x2b6/0x310\n[ 38.352663] [\u003cffffffff8150824f\u003e] sock_sendmsg+0x10f/0x130\n[ 38.352668] [\u003cffffffff8150abe0\u003e] ? move_addr_to_kernel+0x60/0xb0\n[ 38.352673] [\u003cffffffff81515f04\u003e] ? verify_iovec+0x64/0xe0\n[ 38.352677] [\u003cffffffff81509c46\u003e] __sys_sendmsg+0x386/0x390\n[ 38.352682] [\u003cffffffff810ffaf9\u003e] ? handle_mm_fault+0x139/0x210\n[ 38.352687] [\u003cffffffff8165b5bc\u003e] ? do_page_fault+0x1ec/0x4f0\n[ 38.352693] [\u003cffffffff8106ba4d\u003e] ? set_next_entity+0x9d/0xb0\n[ 38.352699] [\u003cffffffff81310b49\u003e] ? tty_ldisc_deref+0x9/0x10\n[ 38.352703] [\u003cffffffff8106d363\u003e] ? pick_next_task_fair+0x63/0x140\n[ 38.352708] [\u003cffffffff8150b8d4\u003e] sys_sendmsg+0x44/0x80\n[ 38.352713] [\u003cffffffff8165f8e2\u003e] system_call_fastpath+0x16/0x1b\n\nIt stems from holding a spinlock (trace_state_lock) while attempting to register\nor unregister tracepoint hooks, making in_atomic() true in this context, leading\nto the warning when the tracepoint calls might_sleep() while its taking a mutex.\nSince we only use the trace_state_lock to prevent trace protocol state races, as\nwell as hardware stat list updates on an rcu write side, we can just convert the\nspinlock to a mutex to avoid this problem.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nReported-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: David Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4dcc0637fc3c36c1f58ffdcaf2dc0dc7de72449f", "tree": "587ffa9493e4b6af014f9acb2c09177c2c54af3b", "parents": [ "afa762f6871a8cb05fbef5d0f83fac14304aa816", "985140369be1e886754d8ac0375dd64e4f727311" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Apr 27 15:16:43 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Apr 27 15:16:43 2012 -0400" }, "message": "Merge branch \u0027for-upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth\n" }, { "commit": "ea8cfa06795bb30d2ea61f503ef129284492c06a", "tree": "48fb210bfaedbf1c488bc0b096f1591ce2c98495", "parents": [ "37629b572cc4e80fc24b4139a24df1a89415d534" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 27 13:00:17 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:00 2012 -0400" }, "message": "SUNRPC: traverse clients tree on PipeFS event\n\nv2: recursion was replaced by loop\n\nIf client is a clone, then it\u0027s parent can not be in the list.\nBut parent\u0027s Pipefs dentries have to be created and destroyed.\n\nNote: event skip helper for clients introduced\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "37629b572cc4e80fc24b4139a24df1a89415d534", "tree": "49d77495315e93ad187467837779f88073c37f15", "parents": [ "7aab449e5a2ebfa9c5116e87e16536bc4195e4de" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 20 18:19:56 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:10:00 2012 -0400" }, "message": "SUNRPC: set per-net PipeFS superblock before notification\n\nThere can be a case, when on MOUNT event RPC client (after it\u0027s dentries were\ncreated) is not longer hold by anyone except notification callback.\nI.e. on release this client will be destoroyed. And it\u0027s dentries have to be\ndestroyed as well. Which in turn requires per-net PipeFS superblock to be set.\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "7aab449e5a2ebfa9c5116e87e16536bc4195e4de", "tree": "c948a96ddd87c2ed708875c961c9e3577737ae08", "parents": [ "a4dff1bc492ee4a2184d384ae8b5bcab5859e150" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 20 18:19:18 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:09:59 2012 -0400" }, "message": "SUNRPC: skip clients with program without PipeFS entries\n\n1) This is sane.\n2) Otherwise there will be soft lockup:\n\ndo {\n\trpc_get_client_for_event (clnt-\u003ecl_dentry \u003d\u003d NULL \u003d\u003d\u003e choose)\n\t__rpc_pipefs_event (clnt-\u003ecl_program-\u003epipe_dir_name \u003d\u003d NULL \u003d\u003d\u003e return)\n} while (1)\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a4dff1bc492ee4a2184d384ae8b5bcab5859e150", "tree": "b6bdb438cfa7c041d6e0a7b42f8c10c213961215", "parents": [ "5794d21ef4639f0e33440927bb903f9598c21e92" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Fri Apr 20 18:11:02 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Fri Apr 27 14:09:59 2012 -0400" }, "message": "SUNRPC: skip dead but not buried clients on PipeFS events\n\nThese clients can\u0027t be safely dereferenced if their counter in 0.\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "651913ce9de2bbcedef608c5d6cf39c244248509", "tree": "c2c25a9e8f5c1e8e29c81f857fcbdcb5c4945f64", "parents": [ "8b6efb75e9467f7c2df279cbd657f741ec3493cf" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Fri Apr 27 11:29:37 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 27 12:34:39 2012 -0400" }, "message": "tcp: clean up use of jiffies in tcp_rcv_rtt_measure()\n\nClean up a reference to jiffies in tcp_rcv_rtt_measure() that should\ninstead reference tcp_time_stamp. Since the result of the subtraction\nis passed into a function taking u32, this should not change any\nbehavior (and indeed the generated assembly does not change on\nx86_64). However, it seems worth cleaning this up for consistency and\nclarity (and perhaps to avoid bugs if this is copied and pasted\nsomewhere else).\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "768f7c7c121e80f458a9d013b2e8b169e5dfb1e5", "tree": "dab910f7034bdb550e9b4f91f60045e64986e500", "parents": [ "8deff4af8745561efd2be34ee30cc57a6f0107c6" ], "author": { "name": "alex.bluesman.smirnov@gmail.com", "email": "alex.bluesman.smirnov@gmail.com", "time": "Wed Apr 25 23:24:58 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 26 05:32:55 2012 -0400" }, "message": "6lowpan: add missing spin_lock_init()\n\nAdd missing spin_lock_init() for frames list lock.\n\nSigned-off-by: Alexander Smirnov \u003calex.bluesman.smirnov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8deff4af8745561efd2be34ee30cc57a6f0107c6", "tree": "d2b3aaa6d55258ff020687c50d4122e6aebef963", "parents": [ "0848e4043014631d792a66266d6d7d64a7f21da5" ], "author": { "name": "alex.bluesman.smirnov@gmail.com", "email": "alex.bluesman.smirnov@gmail.com", "time": "Wed Apr 25 23:24:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 26 05:32:55 2012 -0400" }, "message": "6lowpan: clean up fragments list if module unloaded\n\nClean all the pending fragments and relative timers if 6lowpan link\nis going to be deleted.\n\nSigned-off-by: Alexander Smirnov \u003calex.bluesman.smirnov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0848e4043014631d792a66266d6d7d64a7f21da5", "tree": "ebaba22fad4a214419140ad021ecb797d2e9ddb1", "parents": [ "8fdd2e25fb0cf82c8af62235366fe1a223c80752" ], "author": { "name": "alex.bluesman.smirnov@gmail.com", "email": "alex.bluesman.smirnov@gmail.com", "time": "Wed Apr 25 23:24:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 26 05:32:55 2012 -0400" }, "message": "6lowpan: fix segmentation fault caused by mlme request\n\nAdd nescesary mlme callbacks to satisfy \"iz list\" request from user space.\nDue to 6lowpan device doesn\u0027t have its own phy, mlme implemented as a pipe\nto a real phy to which 6lowpan is attached.\n\nSigned-off-by: Alexander Smirnov \u003calex.bluesman.smirnov@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "39f618b4fd95ae243d940ec64c961009c74e3333", "tree": "f96ef28f9d3ff364da1710f32ff44c31873fb714", "parents": [ "8d08d71ce59438a6ef06be5db07966e0c144b74e" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Wed Apr 25 00:29:58 2012 +0300" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Apr 26 15:26:35 2012 +0900" }, "message": "ipvs: reset ipvs pointer in netns\n\n\tMake sure net-\u003eipvs is reset on netns cleanup or failed\ninitialization. It is needed for IPVS applications to know that\nIPVS core is not loaded in netns.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nAcked-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "8d08d71ce59438a6ef06be5db07966e0c144b74e", "tree": "804e30b7bd516ff39f6f6656fc760ea8db993ead", "parents": [ "8f9b9a2fad47af27e14b037395e03cd8278d96d7" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Wed Apr 25 00:29:59 2012 +0300" }, "committer": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Thu Apr 26 15:26:35 2012 +0900" }, "message": "ipvs: add check in ftp for initialized core\n\n\tAvoid crash when registering ip_vs_ftp after\nthe IPVS core initialization for netns fails. Do this by\nchecking for present core (net-\u003eipvs).\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nAcked-by: Hans Schillstrom \u003chans.schillstrom@ericsson.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\n" }, { "commit": "2300fd67b4f29eec19addb15a8571837228f63fc", "tree": "5f2cfcc87f81ff9fa607ab45c1f0a9adf644cc76", "parents": [ "86ec090e58fca1025676e775093a87ab699f7f4d", "7bf97bc27308cfdc7a8dadd40ae50f7c4cb09b01" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n - Fix NFSv4 infinite loops on open(O_TRUNC)\n - Fix an Oops and an infinite loop in the NFSv4 flock code\n - Don\u0027t register the PipeFS filesystem until it has been set up\n - Fix an Oops in nfs_try_to_update_request\n - Don\u0027t reuse NFSv4 open owners: fixes a bad sequence id storm.\n\n* tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFSv4: Keep dropped state owners on the LRU list for a while\n NFSv4: Ensure that we don\u0027t drop a state owner more than once\n NFSv4: Ensure we do not reuse open owner names\n nfs: Enclose hostname in brackets when needed in nfs_do_root_mount\n NFS: put open context on error in nfs_flush_multi\n NFS: put open context on error in nfs_pagein_multi\n NFSv4: Fix open(O_TRUNC) and ftruncate() error handling\n NFSv4: Ensure that we check lock exclusive/shared type against open modes\n NFSv4: Ensure that the LOCK code sets exception-\u003einode\n NFS: check for req\u003d\u003dNULL in nfs_try_to_update_request cleanup\n SUNRPC: register PipeFS file system after pernet sybsystem\n" }, { "commit": "62ad6fcd743792bf294f2a7ba26ab8f462065150", "tree": "6c8a4302149d69c5cd3933bbf09a7da5b148780e", "parents": [ "202149265770426f0965557ffa0b500fbbd701dd" ], "author": { "name": "Shan Wei", "email": "davidshan@tencent.com", "time": "Tue Apr 24 18:15:41 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 25 20:43:01 2012 -0400" }, "message": "udp_diag: implement idiag_get_info for udp/udplite to get queue information\n\nWhen we use netlink to monitor queue information for udp socket,\nidiag_rqueue and idiag_wqueue of inet_diag_msg are returned with 0.\n\nKeep consistent with netstat, just return back allocated rmem/wmem size.\n\nSigned-off-by: Shan Wei \u003cdavidshan@tencent.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "395836282f7cf8b1dac9b9c2aa2bacddfa1580b5", "tree": "5b1585dbe4f9525d54d5256875a8f038a78d0c05", "parents": [ "2a5809499e35b53a6044fd34e72b242688b7a862", "afa762f6871a8cb05fbef5d0f83fac14304aa816" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 25 13:41:25 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 25 13:41:25 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "8f9b9a2fad47af27e14b037395e03cd8278d96d7", "tree": "5b2d738403991a960ef341ff122f5f03c9b21758", "parents": [ "7118c07a844d367560ee91adb2071bde2fabcdbf" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Fri Apr 13 18:08:43 2012 +0300" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Apr 25 11:16:30 2012 +0200" }, "message": "ipvs: fix crash in ip_vs_control_net_cleanup on unload\n\n\tcommit 14e405461e664b777e2a5636e10b2ebf36a686ec (2.6.39)\n(\"Add __ip_vs_control_{init,cleanup}_sysctl()\")\nintroduced regression due to wrong __net_init for\n__ip_vs_control_cleanup_sysctl. This leads to crash when\nthe ip_vs module is unloaded.\n\n\tFix it by changing __net_init to __net_exit for\nthe function that is already renamed to ip_vs_control_net_cleanup_sysctl.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Hans Schillstrom \u003chans@schillstrom.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "7118c07a844d367560ee91adb2071bde2fabcdbf", "tree": "baaba6f805195e3af22a62332b832e771d93bca7", "parents": [ "6ba900676bec8baaf61aa2f85b7345c0e65774d9" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Sat Apr 14 12:37:46 2012 -0400" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Apr 25 11:16:12 2012 +0200" }, "message": "ipvs: Verify that IP_VS protocol has been registered\n\nThe registration of a protocol might fail, there were no checks\nand all registrations were assumed to be correct. This lead to\nNULL ptr dereferences when apps tried registering.\n\nFor example:\n\n[ 1293.226051] BUG: unable to handle kernel NULL pointer dereference at 0000000000000018\n[ 1293.227038] IP: [\u003cffffffff822aacb0\u003e] tcp_register_app+0x60/0xb0\n[ 1293.227038] PGD 391de067 PUD 6c20b067 PMD 0\n[ 1293.227038] Oops: 0000 [#1] PREEMPT SMP\n[ 1293.227038] CPU 1\n[ 1293.227038] Pid: 19609, comm: trinity Tainted: G W 3.4.0-rc1-next-20120405-sasha-dirty #57\n[ 1293.227038] RIP: 0010:[\u003cffffffff822aacb0\u003e] [\u003cffffffff822aacb0\u003e] tcp_register_app+0x60/0xb0\n[ 1293.227038] RSP: 0018:ffff880038c1dd18 EFLAGS: 00010286\n[ 1293.227038] RAX: ffffffffffffffc0 RBX: 0000000000001500 RCX: 0000000000010000\n[ 1293.227038] RDX: 0000000000000000 RSI: ffff88003a2d5888 RDI: 0000000000000282\n[ 1293.227038] RBP: ffff880038c1dd48 R08: 0000000000000000 R09: 0000000000000000\n[ 1293.227038] R10: 0000000000000000 R11: 0000000000000000 R12: ffff88003a2d5668\n[ 1293.227038] R13: ffff88003a2d5988 R14: ffff8800696a8ff8 R15: 0000000000000000\n[ 1293.227038] FS: 00007f01930d9700(0000) GS:ffff88007ce00000(0000) knlGS:0000000000000000\n[ 1293.227038] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n[ 1293.227038] CR2: 0000000000000018 CR3: 0000000065dfc000 CR4: 00000000000406e0\n[ 1293.227038] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n[ 1293.227038] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n[ 1293.227038] Process trinity (pid: 19609, threadinfo ffff880038c1c000, task ffff88002dc73000)\n[ 1293.227038] Stack:\n[ 1293.227038] ffff880038c1dd48 00000000fffffff4 ffff8800696aada0 ffff8800694f5580\n[ 1293.227038] ffffffff8369f1e0 0000000000001500 ffff880038c1dd98 ffffffff822a716b\n[ 1293.227038] 0000000000000000 ffff8800696a8ff8 0000000000000015 ffff8800694f5580\n[ 1293.227038] Call Trace:\n[ 1293.227038] [\u003cffffffff822a716b\u003e] ip_vs_app_inc_new+0xdb/0x180\n[ 1293.227038] [\u003cffffffff822a7258\u003e] register_ip_vs_app_inc+0x48/0x70\n[ 1293.227038] [\u003cffffffff822b2fea\u003e] __ip_vs_ftp_init+0xba/0x140\n[ 1293.227038] [\u003cffffffff821c9060\u003e] ops_init+0x80/0x90\n[ 1293.227038] [\u003cffffffff821c90cb\u003e] setup_net+0x5b/0xe0\n[ 1293.227038] [\u003cffffffff821c9416\u003e] copy_net_ns+0x76/0x100\n[ 1293.227038] [\u003cffffffff810dc92b\u003e] create_new_namespaces+0xfb/0x190\n[ 1293.227038] [\u003cffffffff810dca21\u003e] unshare_nsproxy_namespaces+0x61/0x80\n[ 1293.227038] [\u003cffffffff810afd1f\u003e] sys_unshare+0xff/0x290\n[ 1293.227038] [\u003cffffffff8187622e\u003e] ? trace_hardirqs_on_thunk+0x3a/0x3f\n[ 1293.227038] [\u003cffffffff82665539\u003e] system_call_fastpath+0x16/0x1b\n[ 1293.227038] Code: 89 c7 e8 34 91 3b 00 89 de 66 c1 ee 04 31 de 83 e6 0f 48 83 c6 22 48 c1 e6 04 4a 8b 14 26 49 8d 34 34 48 8d 42 c0 48 39 d6 74 13 \u003c66\u003e 39 58 58 74 22 48 8b 48 40 48 8d 41 c0 48 39 ce 75 ed 49 8d\n[ 1293.227038] RIP [\u003cffffffff822aacb0\u003e] tcp_register_app+0x60/0xb0\n[ 1293.227038] RSP \u003cffff880038c1dd18\u003e\n[ 1293.227038] CR2: 0000000000000018\n[ 1293.379284] ---[ end trace 364ab40c7011a009 ]---\n[ 1293.381182] Kernel panic - not syncing: Fatal exception in interrupt\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nAcked-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "afa762f6871a8cb05fbef5d0f83fac14304aa816", "tree": "170556b5b27b7028ded1600358439dc66e18ebbb", "parents": [ "78cbcf2b9dbe0565820dc7721316f9c401000a68" ], "author": { "name": "Eliad Peller", "email": "eliad@wizery.com", "time": "Mon Apr 23 14:45:15 2012 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 24 14:42:42 2012 -0400" }, "message": "mac80211: call ieee80211_mgd_stop() on interface stop\n\nieee80211_mgd_teardown() is called on netdev removal, which\noccurs after the vif was already removed from the low-level\ndriver, resulting in the following warning:\n\n[ 4809.014734] ------------[ cut here ]------------\n[ 4809.019861] WARNING: at net/mac80211/driver-ops.h:12 ieee80211_bss_info_change_notify+0x200/0x2c8 [mac80211]()\n[ 4809.030388] wlan0: Failed check-sdata-in-driver check, flags: 0x4\n[ 4809.036862] Modules linked in: wlcore_sdio(-) wl12xx wlcore mac80211 cfg80211 [last unloaded: cfg80211]\n[ 4809.046849] [\u003cc001bd4c\u003e] (unwind_backtrace+0x0/0x12c)\n[ 4809.055937] [\u003cc047cf1c\u003e] (dump_stack+0x20/0x24)\n[ 4809.065385] [\u003cc003e334\u003e] (warn_slowpath_common+0x5c/0x74)\n[ 4809.075589] [\u003cc003e408\u003e] (warn_slowpath_fmt+0x40/0x48)\n[ 4809.088291] [\u003cbf033630\u003e] (ieee80211_bss_info_change_notify+0x200/0x2c8 [mac80211])\n[ 4809.102844] [\u003cbf067f84\u003e] (ieee80211_destroy_auth_data+0x80/0xa4 [mac80211])\n[ 4809.116276] [\u003cbf068004\u003e] (ieee80211_mgd_teardown+0x5c/0x74 [mac80211])\n[ 4809.129331] [\u003cbf043f18\u003e] (ieee80211_teardown_sdata+0xb0/0xd8 [mac80211])\n[ 4809.141595] [\u003cc03b5e58\u003e] (rollback_registered_many+0x228/0x2f0)\n[ 4809.153056] [\u003cc03b5f48\u003e] (unregister_netdevice_many+0x28/0x50)\n[ 4809.165696] [\u003cbf041ea8\u003e] (ieee80211_remove_interfaces+0xb4/0xdc [mac80211])\n[ 4809.179151] [\u003cbf032174\u003e] (ieee80211_unregister_hw+0x50/0xf0 [mac80211])\n[ 4809.191043] [\u003cbf0bebb4\u003e] (wlcore_remove+0x5c/0x7c [wlcore])\n[ 4809.201491] [\u003cc02c6918\u003e] (platform_drv_remove+0x24/0x28)\n[ 4809.212029] [\u003cc02c4d50\u003e] (__device_release_driver+0x8c/0xcc)\n[ 4809.222738] [\u003cc02c4e84\u003e] (device_release_driver+0x30/0x3c)\n[ 4809.233099] [\u003cc02c4258\u003e] (bus_remove_device+0x10c/0x128)\n[ 4809.242620] [\u003cc02c26f8\u003e] (device_del+0x11c/0x17c)\n[ 4809.252150] [\u003cc02c6de0\u003e] (platform_device_del+0x28/0x68)\n[ 4809.263051] [\u003cbf0df49c\u003e] (wl1271_remove+0x3c/0x50 [wlcore_sdio])\n[ 4809.273590] [\u003cc03806b0\u003e] (sdio_bus_remove+0x48/0xf8)\n[ 4809.283754] [\u003cc02c4d50\u003e] (__device_release_driver+0x8c/0xcc)\n[ 4809.293729] [\u003cc02c4e2c\u003e] (driver_detach+0x9c/0xc4)\n[ 4809.303163] [\u003cc02c3d7c\u003e] (bus_remove_driver+0xc4/0xf4)\n[ 4809.312973] [\u003cc02c5a98\u003e] (driver_unregister+0x70/0x7c)\n[ 4809.323220] [\u003cc03809c4\u003e] (sdio_unregister_driver+0x24/0x2c)\n[ 4809.334213] [\u003cbf0df458\u003e] (wl1271_exit+0x14/0x1c [wlcore_sdio])\n[ 4809.344930] [\u003cc009b1a4\u003e] (sys_delete_module+0x228/0x2a8)\n[ 4809.354734] ---[ end trace 515290ccf5feb522 ]---\n\nRename ieee80211_mgd_teardown() to ieee80211_mgd_stop(),\nand call it on ieee80211_do_stop().\n\nSigned-off-by: Eliad Peller \u003celiad@wizery.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "16cde9931bcd8d8ca968ef1cded02684ea040374", "tree": "1ecdedcee16e1bb04f22765d6299e1f17386f514", "parents": [ "ac71311e65e2c4c2dbac76db698fecbee755b016" ], "author": { "name": "Szymon Janc", "email": "szymon.janc@tieto.com", "time": "Fri Apr 13 12:32:42 2012 +0200" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo@padovan.org", "time": "Tue Apr 24 11:38:41 2012 -0300" }, "message": "Bluetooth: Fix missing break in hci_cmd_complete_evt\n\nCommand complete event for HCI_OP_USER_PASSKEY_NEG_REPLY would result\nin calling handler function also for HCI_OP_LE_SET_SCAN_PARAM. This\ncould result in undefined behaviour.\n\nSigned-off-by: Szymon Janc \u003cszymon.janc@tieto.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo@padovan.org\u003e\n" }, { "commit": "a881e963c7fe1f226e991ee9bbe8907acda93294", "tree": "5d2b2c01097300377821132f743cddd4fc90fed6", "parents": [ "4d634ca35a8b38530b134ae92bc9e3cc9c23c030" ], "author": { "name": "Peter Huang (Peng)", "email": "peter.huangpeng@huawei.com", "time": "Thu Apr 19 20:12:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 24 00:16:24 2012 -0400" }, "message": "set fake_rtable\u0027s dst to NULL to avoid kernel Oops\n\nbridge: set fake_rtable\u0027s dst to NULL to avoid kernel Oops\n\nwhen bridge is deleted before tap/vif device\u0027s delete, kernel may\nencounter an oops because of NULL reference to fake_rtable\u0027s dst.\nSet fake_rtable\u0027s dst to NULL before sending packets out can solve\nthis problem.\n\nv4 reformat, change br_drop_fake_rtable(skb) to {}\n\nv3 enrich commit header\n\nv2 introducing new flag DST_FAKE_RTABLE to dst_entry struct.\n\n[ Use \"do { } while (0)\" for nop br_drop_fake_rtable()\n implementation -DaveM ]\n\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Peter Huang \u003cpeter.huangpeng@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d135c522f1234f62e81be29cebdf59e9955139ad", "tree": "7e151f3995d6a30499c2bec2c07b2bf68754788e", "parents": [ "163faf31778e536ac6125bc8b14f4667adc910e9" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Sun Apr 22 09:45:47 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 22 17:09:35 2012 -0400" }, "message": "tcp: fix TCP_MAXSEG for established IPv6 passive sockets\n\nCommit f5fff5d forgot to fix TCP_MAXSEG behavior IPv6 sockets, so IPv6\nTCP server sockets that used TCP_MAXSEG would find that the advmss of\nchild sockets would be incorrect. This commit mirrors the advmss logic\nfrom tcp_v4_syn_recv_sock in tcp_v6_syn_recv_sock. Eventually this\nlogic should probably be shared between IPv4 and IPv6, but this at\nleast fixes this issue.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bbe362be5368b9f531b95a4a9b502ae2832e1dac", "tree": "6f31a927c4224e5366d97c621362020ccf7dd689", "parents": [ "e8195b24feb208f6e944e7542779f4397776794d" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Apr 19 07:16:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Apr 21 16:28:38 2012 -0400" }, "message": "drop_monitor: allow more events per second\n\nIt seems there is a logic error in trace_drop_common(), since we store\nonly 64 drops, even if they are from same location.\n\nThis fix is a one liner, but we probably need more work to avoid useless\natomic dec/inc\n\nNow I can watch 1 Mpps drops through dropwatch...\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3adadc08cc1e2cbcc15a640d639297ef5fcb17f5", "tree": "20990c83f62157caf753736e63ea98548404a954", "parents": [ "996f73937cd85031da8dbcd3222a710cb762d428" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Apr 18 16:11:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Apr 19 15:37:48 2012 -0400" }, "message": "net ax25: Reorder ax25_exit to remove races.\n\nWhile reviewing the sysctl code in ax25 I spotted races in ax25_exit\nwhere it is possible to receive notifications and packets after already\nfreeing up some of the data structures needed to process those\nnotifications and updates.\n\nCall unregister_netdevice_notifier early so that the rest of the cleanup\ncode does not need to deal with network devices. This takes advantage\nof my recent enhancement to unregister_netdevice_notifier to send\nunregister notifications of all network devices that are current\nregistered.\n\nMove the unregistration for packet types, socket types and protocol\ntypes before we cleanup any of the ax25 data structures to remove the\npossibilities of other races.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22b4a4f22da4b39c6f7f679fd35f3d35c91bf851", "tree": "6cd9d5d169384e39c030e18f75c1b1e0d792e5bd", "parents": [ "56fa9b16303b0a3bad88ff528c4d5ff54d8cdb47" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Wed Apr 18 10:14:23 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 18 16:52:45 2012 -0400" }, "message": "tcp: fix retransmit of partially acked frames\n\nAlexander Beregalov reported skb_over_panic errors and provided stack\ntrace.\n\nI occurs commit a21d45726aca (tcp: avoid order-1 allocations on wifi and\ntx path) added a regression, when a retransmit is done after a partial\nACK.\n\ntcp_retransmit_skb() tries to aggregate several frames if the first one\nhas enough available room to hold the following ones payload. This is\ncontrolled by /proc/sys/net/ipv4/tcp_retrans_collapse tunable (default :\nenabled)\n\nProblem is we must make sure _pskb_trim_head() doesnt fool\nskb_availroom() when pulling some bytes from skb (this pull is done when\nreceiver ACK part of the frame).\n\nReported-by: Alexander Beregalov \u003ca.beregalov@gmail.com\u003e\nCc: Marc MERLIN \u003cmarc@merlins.org\u003e\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "56fa9b16303b0a3bad88ff528c4d5ff54d8cdb47", "tree": "cb367e928baae532e552dd285700a9fb1f290391", "parents": [ "b922934d017f1cc831b017913ed7d1a56c558b43", "dbd717e37bf1409fd250d13aef2cab07bcae8c88" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 18 15:26:52 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 18 15:26:52 2012 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n\nFrom John:\n\nAnother batch of fixes intended for 3.4...\n\nFirst up, we have a minor signedness fix for libertas from Amitkumar\nKarwar. Next, Arend gives us a brcm80211 fix for correctly enabling\nTx FIFOs on channels 12 and 13. Bing Zhao gives us some register\naddress corrections for mwifiex. Felix give us a trio of fixes --\none for ath9k to wake the hardware properly from full sleep, one for\nmac80211 to properly handle packets in cooked monitor mode, and one\nfor ensuring that the proper HT mode selection is honored.\n\nHauke gives us a bcma fix for handling the lack of an sprom. Jonathon\nBither gives us an ath5k fix for a missing THIS_MODULE build issue,\nand another ath5k fix for an io mapping leak. Lukasz Kucharczyk\nfixes a bitwise check in cfg80211, and Sujith gives us an ath9k fix\nfor assigning sequence numbers for fragmented frames. Finally, we\nhave a MAINTAINERS change from Wey-Yi Guy -- congrats to Johannes\nBerg for taking the lead on iwlwifi. :-)\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dbd717e37bf1409fd250d13aef2cab07bcae8c88", "tree": "1e8c0b94388bf7a5822a49ff3c47bddc06382c2b", "parents": [ "9fe5642f4a3b13beb43c2633db7df22dd9d99250", "fd09c85fe15aa66a69f091ba178817d5ef82476d" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 18 13:37:33 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 18 13:37:33 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "adae0fe0ea87e8fb1a72dde304937c60759b495f", "tree": "27cab6b39b71e4264779a3123b62d49e6afb0a17", "parents": [ "6c216ec636f75d834461be15f83ec41a6759bd2b" ], "author": { "name": "Stanislav Kinsbursky", "email": "skinsbursky@parallels.com", "time": "Thu Apr 05 21:04:37 2012 +0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Apr 18 11:05:48 2012 -0400" }, "message": "SUNRPC: register PipeFS file system after pernet sybsystem\n\nPipeFS superblock creation routine relays on SUNRPC pernet data presense, which\nis created on register_pernet_subsys() call in SUNRPC module init function.\nRegistering of PipeFS filesystem prior to registering of per-net subsystem\nleads to races (mount of PipeFS can dereference uninitialized data).\n\nSigned-off-by: Stanislav Kinsbursky \u003cskinsbursky@parallels.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "b922934d017f1cc831b017913ed7d1a56c558b43", "tree": "6d0d08fc459a3eb2d36bccea023059ef76b90dfe", "parents": [ "9fe5642f4a3b13beb43c2633db7df22dd9d99250" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Mon Apr 16 04:43:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 18 00:05:33 2012 -0400" }, "message": "netns: do not leak net_generic data on failed init\n\nops_init should free the net_generic data on\ninit failure and __register_pernet_operations should not\ncall ops_free when NET_NS is not enabled.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nReviewed-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4d846f02392a710f9604892ac3329e628e60a230", "tree": "8c8a8cd663914e546b324d0657fdfad2c8becdee", "parents": [ "48159f009f5f92ef5962e7c278ac615d74242fa5" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Apr 16 23:28:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 17 22:32:00 2012 -0400" }, "message": "tcp: fix tcp_grow_window() for large incoming frames\n\ntcp_grow_window() has to grow rcv_ssthresh up to window_clamp, allowing\nsender to increase its window.\n\ntcp_grow_window() still assumes a tcp frame is under MSS, but its no\nlonger true with LRO/GRO.\n\nThis patch fixes one of the performance issue we noticed with GRO on.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6741e7f048dacc92e37c5d724ff5c64e45f6c2c9", "tree": "23e0385e77d8b773a19c4a23677f34945a6da1e2", "parents": [ "15fae50a9bd28a9fe490b053ff4353f8a38ea5a0" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Apr 16 22:10:42 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 17 14:17:04 2012 -0400" }, "message": "mac80211: fix logic error in ibss channel type check\n\nThe broken check leads to rate control attempting to use HT40 while\nthe driver is configured for HT20. This leads to interesting hardware\nissues.\n\nHT40 can only be used if the channel type is either HT40- or HT40+\nand if the channel type of the cell matches the local type.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "973ef21a676e55a8e1a100a6e109f0c116ea75e8", "tree": "f1cde80fd13225f7fbc18562408459eb8e32fd3c", "parents": [ "32998cc96a76cc3f42f66b55fec301377e439c66" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Apr 16 14:56:48 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Apr 17 14:17:04 2012 -0400" }, "message": "mac80211: fix truncated packets in cooked monitor rx\n\nCooked monitor rx was recently changed to use ieee80211_add_rx_radiotap_header\ninstead of generating only limited radiotap information.\nieee80211_add_rx_radiotap_header assumes that FCS info is still present if\nthe hardware supports receiving it, however when cooked monitor rx packets\nare processed, FCS info has already been stripped.\nFix this by adding an extra flag indicating FCS presence.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "244b65dbfede788f2fa3fe2463c44d0809e97c6b", "tree": "10d2c717d7a5e547b4451b61e35b162c0457b8b9", "parents": [ "a49bcabedc18319f673319d5e71b5751e3978179" ], "author": { "name": "David Ward", "email": "david.ward@ll.mit.edu", "time": "Sun Apr 15 12:31:45 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 16 23:51:07 2012 -0400" }, "message": "net_sched: gred: Fix oops in gred_dump() in WRED mode\n\nA parameter set exists for WRED mode, called wred_set, to hold the same\nvalues for qavg and qidlestart across all VQs. The WRED mode values had\nbeen previously held in the VQ for the default DP. After these values\nwere moved to wred_set, the VQ for the default DP was no longer created\nautomatically (so that it could be omitted on purpose, to have packets\nin the default DP enqueued directly to the device without using RED).\n\nHowever, gred_dump() was overlooked during that change; in WRED mode it\nstill reads qavg/qidlestart from the VQ for the default DP, which might\nnot even exist. As a result, this command sequence will cause an oops:\n\ntc qdisc add dev $DEV handle $HANDLE parent $PARENT gred setup \\\n DPs 3 default 2 grio\ntc qdisc change dev $DEV handle $HANDLE gred DP 0 prio 8 $RED_OPTIONS\ntc qdisc change dev $DEV handle $HANDLE gred DP 1 prio 8 $RED_OPTIONS\n\nThis fixes gred_dump() in WRED mode to use the values held in wred_set.\n\nSigned-off-by: David Ward \u003cdavid.ward@ll.mit.edu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ec5bcadc21e13ceba8c144e4731eccac01d04f7", "tree": "f0851fd42f167cf85539d1bd9109b17e0e0bf59e", "parents": [ "745c0ce35f904aeff8e1ea325c259a14a00ff1b7" ], "author": { "name": "Vishal Agarwal", "email": "vishal.agarwal@stericsson.com", "time": "Mon Apr 16 14:44:44 2012 +0530" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Mon Apr 16 12:57:45 2012 +0300" }, "message": "Bluetooth: Temporary keys should be retained during connection\n\nIf a key is non persistent then it should not be used in future\nconnections but it should be kept for current connection. And it\nshould be removed when connecion is removed.\n\nSigned-off-by: Vishal Agarwal \u003cvishal.agarwal@stericsson.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "745c0ce35f904aeff8e1ea325c259a14a00ff1b7", "tree": "e1d05d006621b7cfd1009265ea2afe73b5cc2149", "parents": [ "87522a433ba6886b5ccbb497e0a7cb8097def64e" ], "author": { "name": "Vishal Agarwal", "email": "vishal.agarwal@stericsson.com", "time": "Fri Apr 13 17:43:22 2012 +0530" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Mon Apr 16 12:57:40 2012 +0300" }, "message": "Bluetooth: hci_persistent_key should return bool\n\nThis patch changes the return type of function hci_persistent_key\nfrom int to bool because it makes more sense to return information\nwhether a key is persistent or not as a bool.\n\nSigned-off-by: Vishal Agarwal \u003cvishal.agarwal@stericsson.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "e55a4046dab28c440c96890bdddcf02dc8981f2d", "tree": "e133ef763bc5fdaaec8667cab635daba9f38d3db", "parents": [ "badc4f07622f0f7093a201638f45e85765f1b5e4" ], "author": { "name": "Lukasz Kucharczyk", "email": "lukasz.kucharczyk@tieto.com", "time": "Wed Apr 11 14:55:10 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Apr 13 14:05:35 2012 -0400" }, "message": "cfg80211: fix interface combinations check.\n\nSigned-off-by: Lukasz Kucharczyk \u003clukasz.kucharczyk@tieto.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1716a96101c49186bb0b8491922fd3e69030235f", "tree": "43794d2f033f439d25c63b1796e138d65fd746a8", "parents": [ "d62f8dbb5b7771910f7c4657345df8ac93acb832" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Fri Apr 06 00:13:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 12:58:29 2012 -0400" }, "message": "ipv6: fix problem with expired dst cache\n\nIf the ipv6 dst cache which copy from the dst generated by ICMPV6 RA packet.\nthis dst cache will not check expire because it has no RTF_EXPIRES flag.\nSo this dst cache will always be used until the dst gc run.\n\nChange the struct dst_entry,add a union contains new pointer from and expires.\nWhen rt6_info.rt6i_flags has no RTF_EXPIRES flag,the dst.expires has no use.\nwe can use this field to point to where the dst cache copy from.\nThe dst.from is only used in IPV6.\n\nrt6_check_expired check if rt6_info.dst.from is expired.\n\nip6_rt_copy only set dst.from when the ort has flag RTF_ADDRCONF\nand RTF_DEFAULT.then hold the ort.\n\nip6_dst_destroy release the ort.\n\nAdd some functions to operate the RTF_EXPIRES flag and expires(from) together.\nand change the code to use these new adding functions.\n\nChanges from v5:\nmodify ip6_route_add and ndisc_router_discovery to use new adding functions.\n\nOnly set dst.from when the ort has flag RTF_ADDRCONF\nand RTF_DEFAULT.then hold the ort.\n\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5c699fb7d88d360023f3b3f5291cbf5b59883a1b", "tree": "a9b6b8d502fd4d2e1487a207d3200df8764ec9fa", "parents": [ "c9be48dc8bb22f1f6e6ff1560b2b28e925a0b815" ], "author": { "name": "Tomasz Gregorek", "email": "tomasz.gregorek@stericsson.com", "time": "Thu Apr 12 08:18:07 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "caif: Fix memory leakage in the chnl_net.c.\n\nAdded kfree_skb() calls in the chnk_net.c file on\nthe error paths.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9be48dc8bb22f1f6e6ff1560b2b28e925a0b815", "tree": "b8f42aa6aed3289bf8dfd4b9a036efea93e1df0b", "parents": [ "d1f224ae186b834af647661ffaf403a817c050ce" ], "author": { "name": "James Chapman", "email": "jchapman@katalix.com", "time": "Tue Apr 10 00:10:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "l2tp: don\u0027t overwrite source address in l2tp_ip_bind()\n\nApplications using L2TP/IP sockets want to be able to bind() an L2TP/IP\nsocket to set the local tunnel id while leaving the auto-assigned source\naddress alone. So if no source address is supplied, don\u0027t overwrite\nthe address already stored in the socket.\n\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1f224ae186b834af647661ffaf403a817c050ce", "tree": "ba97e12cf85c7f81e4829928ffdd5b4aad3e1fe7", "parents": [ "31304165ffb888483e0f7c805876f25f493a3049" ], "author": { "name": "James Chapman", "email": "jchapman@katalix.com", "time": "Tue Apr 10 00:10:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "l2tp: fix refcount leak in l2tp_ip sockets\n\nThe l2tp_ip socket close handler does not update the module refcount\ncorrectly which prevents module unload after the first bind() call on\nan L2TPv3 IP encapulation socket.\n\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "89eb06f11c314c2ab4ec59039715dc021933a7a0", "tree": "f31d003d58aff5d798e028ee9be2d1867cc2128b", "parents": [ "03478756b1b9298686ca9c8793e484ae39eb4649" ], "author": { "name": "Julia Lawall", "email": "Julia.Lawall@lip6.fr", "time": "Sun Apr 08 22:41:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:44 2012 -0400" }, "message": "net/key/af_key.c: add missing kfree_skb\n\nAt the point of this error-handling code, alloc_skb has succeded, so free\nthe resulting skb by jumping to the err label.\n\nSigned-off-by: Julia Lawall \u003cJulia.Lawall@lip6.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "03478756b1b9298686ca9c8793e484ae39eb4649", "tree": "9f40562042ebf12858a535c625fa99fd23f14553", "parents": [ "7d3d43dab4e978d8d9ad1acf8af15c9b1c4b0f0f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Apr 06 15:35:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:43 2012 -0400" }, "message": "phonet: Sort out initiailziation and cleanup code.\n\nRecently an oops was reported in phonet if there was a failure during\nnetwork namespace creation.\n\n[ 163.733755] ------------[ cut here ]------------\n[ 163.734501] kernel BUG at include/net/netns/generic.h:45!\n[ 163.734501] invalid opcode: 0000 [#1] PREEMPT SMP\n[ 163.734501] CPU 2\n[ 163.734501] Pid: 19145, comm: trinity Tainted: G W 3.4.0-rc1-next-20120405-sasha-dirty #57\n[ 163.734501] RIP: 0010:[\u003cffffffff824d6062\u003e] [\u003cffffffff824d6062\u003e] phonet_pernet+0x182/0x1a0\n[ 163.734501] RSP: 0018:ffff8800674d5ca8 EFLAGS: 00010246\n[ 163.734501] RAX: 000000003fffffff RBX: 0000000000000000 RCX: ffff8800678c88d8\n[ 163.734501] RDX: 00000000003f4000 RSI: ffff8800678c8910 RDI: 0000000000000282\n[ 163.734501] RBP: ffff8800674d5cc8 R08: 0000000000000000 R09: 0000000000000000\n[ 163.734501] R10: 0000000000000000 R11: 0000000000000000 R12: ffff880068bec920\n[ 163.734501] R13: ffffffff836b90c0 R14: 0000000000000000 R15: 0000000000000000\n[ 163.734501] FS: 00007f055e8de700(0000) GS:ffff88007d000000(0000) knlGS:0000000000000000\n[ 163.734501] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n[ 163.734501] CR2: 00007f055e6bb518 CR3: 0000000070c16000 CR4: 00000000000406e0\n[ 163.734501] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n[ 163.734501] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n[ 163.734501] Process trinity (pid: 19145, threadinfo ffff8800674d4000, task ffff8800678c8000)\n[ 163.734501] Stack:\n[ 163.734501] ffffffff824d5f00 ffffffff810e2ec1 ffff880067ae0000 00000000ffffffd4\n[ 163.734501] ffff8800674d5cf8 ffffffff824d667a ffff880067ae0000 00000000ffffffd4\n[ 163.734501] ffffffff836b90c0 0000000000000000 ffff8800674d5d18 ffffffff824d707d\n[ 163.734501] Call Trace:\n[ 163.734501] [\u003cffffffff824d5f00\u003e] ? phonet_pernet+0x20/0x1a0\n[ 163.734501] [\u003cffffffff810e2ec1\u003e] ? get_parent_ip+0x11/0x50\n[ 163.734501] [\u003cffffffff824d667a\u003e] phonet_device_destroy+0x1a/0x100\n[ 163.734501] [\u003cffffffff824d707d\u003e] phonet_device_notify+0x3d/0x50\n[ 163.734501] [\u003cffffffff810dd96e\u003e] notifier_call_chain+0xee/0x130\n[ 163.734501] [\u003cffffffff810dd9d1\u003e] raw_notifier_call_chain+0x11/0x20\n[ 163.734501] [\u003cffffffff821cce12\u003e] call_netdevice_notifiers+0x52/0x60\n[ 163.734501] [\u003cffffffff821cd235\u003e] rollback_registered_many+0x185/0x270\n[ 163.734501] [\u003cffffffff821cd334\u003e] unregister_netdevice_many+0x14/0x60\n[ 163.734501] [\u003cffffffff823123e3\u003e] ipip_exit_net+0x1b3/0x1d0\n[ 163.734501] [\u003cffffffff82312230\u003e] ? ipip_rcv+0x420/0x420\n[ 163.734501] [\u003cffffffff821c8515\u003e] ops_exit_list+0x35/0x70\n[ 163.734501] [\u003cffffffff821c911b\u003e] setup_net+0xab/0xe0\n[ 163.734501] [\u003cffffffff821c9416\u003e] copy_net_ns+0x76/0x100\n[ 163.734501] [\u003cffffffff810dc92b\u003e] create_new_namespaces+0xfb/0x190\n[ 163.734501] [\u003cffffffff810dca21\u003e] unshare_nsproxy_namespaces+0x61/0x80\n[ 163.734501] [\u003cffffffff810afd1f\u003e] sys_unshare+0xff/0x290\n[ 163.734501] [\u003cffffffff8187622e\u003e] ? trace_hardirqs_on_thunk+0x3a/0x3f\n[ 163.734501] [\u003cffffffff82665539\u003e] system_call_fastpath+0x16/0x1b\n[ 163.734501] Code: e0 c3 fe 66 0f 1f 44 00 00 48 c7 c2 40 60 4d 82 be 01 00 00 00 48 c7 c7 80 d1 23 83 e8 48 2a c4 fe e8 73 06 c8 fe 48 85 db 75 0e \u003c0f\u003e 0b 0f 1f 40 00 eb fe 66 0f 1f 44 00 00 48 83 c4 10 48 89 d8\n[ 163.734501] RIP [\u003cffffffff824d6062\u003e] phonet_pernet+0x182/0x1a0\n[ 163.734501] RSP \u003cffff8800674d5ca8\u003e\n[ 163.861289] ---[ end trace fb5615826c548066 ]---\n\nAfter investigation it turns out there were two issues.\n1) Phonet was not implementing network devices but was using register_pernet_device\n instead of register_pernet_subsys.\n\n This was allowing there to be cases when phonenet was not initialized and\n the phonet net_generic was not set for a network namespace when network\n device events were being reported on the netdevice_notifier for a network\n namespace leading to the oops above.\n\n2) phonet_exit_net was implementing a confusing and special case of handling all\n network devices from going away that it was hard to see was correct, and would\n only occur when the phonet module was removed.\n\n Now that unregister_netdevice_notifier has been modified to synthesize unregistration\n events for the network devices that are extant when called this confusing special\n case in phonet_exit_net is no longer needed.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Rémi Denis-Courmont \u003cremi.denis-courmont@nokia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d3d43dab4e978d8d9ad1acf8af15c9b1c4b0f0f", "tree": "5a61ca199992bc951138750209bbfa588f4d271b", "parents": [ "ecca5c3acc0d0933d89abc44e60afb0cc8170e35" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Apr 06 15:33:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Apr 13 11:01:43 2012 -0400" }, "message": "net: In unregister_netdevice_notifier unregister the netdevices.\n\nWe already synthesize events in register_netdevice_notifier and synthesizing\nevents in unregister_netdevice_notifier allows to us remove the need for\nspecial case cleanup code.\n\nThis change should be safe as it adds no new cases for existing callers\nof unregiser_netdevice_notifier to handle.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "174808af90a06ee59ffedd60c00c252f1f887f25", "tree": "5e026fdc0d2b4d66c0a79267e5755e10d6d04bd8", "parents": [ "778c2dee6f134bf0472ed45eedaee53b4f336afb", "5d949944229b0a08e218723be231731cd86b94f3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 12 14:04:33 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Fix bluetooth userland regression reported by Keith Packard, from\n Gustavo Padovan.\n\n 2) Revert ath9k PS idle change, from Sujith Manoharan.\n\n 3) Correct default TCP memory limits (again), from Eric Dumazet.\n\n 4) Fix tcp_rcv_rtt_update() accidental use of unscaled RTT, from Neal\n Cardwell.\n\n 5) We made a facility for layers like wireless to say how much tailroom\n they need in the SKB for link layer stuff such as wireless\n encryption etc., but TCP works hard to fill every SKB out to the end\n defeating this specification.\n\n This leads to every TCP packet getting reallocated by the wireless\n code in order to have the right amount of tailroom available.\n\n Fix TCP to only fill SKBs out to the real amount of data area it\n asked for during the allocation, this way it won\u0027t eat into the\n slack added for the device\u0027s tailroom needs.\n\n Reported by Marc Merlin and fixed by Eric Dumazet.\n\n 6) Leaks, endian bugs, and new device IDs in bluetooth from Santosh\n Nayak, João Paulo Rechi Vita, Cho, Yu-Chen, Andrei Emeltchenko,\n AceLan Kao, and Andrei Emeltchenko.\n\n 7) OOPS on tty_close fix in bluetooth\u0027s hci_ldisc from Johan Hovold.\n\n 8) netfilter erroneously scales TCP window twice, fix from Changli Gao.\n\n 9) Memleak fix in wext-core from Julia Lawall.\n\n10) Consistently handle invalid TCP packets in ipv4 vs. ipv6 conntrack,\n from Jozsef Kadlecsik.\n\n11) Validate IP header length properly in netfilter conntrack\u0027s\n ipv4_get_l4proto().\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (39 commits)\n NFC: Fix the LLCP Tx fragmentation loop\n rtlwifi: Add missing DMA buffer unmapping for PCI drivers\n rtlwifi: Preallocate USB read buffers and eliminate kalloc in read routine\n tcp: avoid order-1 allocations on wifi and tx path\n net: allow pskb_expand_head() to get maximum tailroom\n bridge: Do not send queries on multicast group leaves\n MAINTAINERS: Mark NATSEMI driver as orphan\u0027d.\n tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample\n tcp: restore correct limit\n Revert \"ath9k: fix going to full-sleep on PS idle\"\n rt2x00: Fix rfkill_polling register function.\n bcma: fix build error on MIPS; implicit pcibios_enable_device\n netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net\n netfilter: nf_ct_ipv4: packets with wrong ihl are invalid\n netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently\n net/wireless/wext-core.c: add missing kfree\n rtlwifi: Fix oops on rate-control failure\n mac80211: Convert WARN_ON to WARN_ON_ONCE\n rtlwifi: rtl8192de: Fix firmware initialization\n nl80211: ensure interface is up in various APIs\n ...\n" }, { "commit": "5d949944229b0a08e218723be231731cd86b94f3", "tree": "5aaf18d11ee4a3486ec7469971f326eb5811679b", "parents": [ "a21d45726acacc963d8baddf74607d9b74e2b723", "b4838d12e1f3cb48c2489a0b08733b5dbf848297" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 09:55:22 2012 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Apr 12 09:55:22 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "b4838d12e1f3cb48c2489a0b08733b5dbf848297", "tree": "45d6df434bb8235c42cbbe975ed58ee3d1e76319", "parents": [ "673f7786e205c87b5d978c62827b9a66d097bebb" ], "author": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Apr 10 19:43:03 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Apr 11 15:09:33 2012 -0400" }, "message": "NFC: Fix the LLCP Tx fragmentation loop\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a21d45726acacc963d8baddf74607d9b74e2b723", "tree": "7cd7e1409ac0242148a0a8117956d08572eb32cf", "parents": [ "87151b8689d890dfb495081f7be9b9e257f7a2df" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 10 20:30:48 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 10:11:12 2012 -0400" }, "message": "tcp: avoid order-1 allocations on wifi and tx path\n\nMarc Merlin reported many order-1 allocations failures in TX path on its\nwireless setup, that dont make any sense with MTU\u003d1500 network, and non\nSG capable hardware.\n\nAfter investigation, it turns out TCP uses sk_stream_alloc_skb() and\nused as a convention skb_tailroom(skb) to know how many bytes of data\npayload could be put in this skb (for non SG capable devices)\n\nNote : these skb used kmalloc-4096 (MTU\u003d1500 + MAX_HEADER +\nsizeof(struct skb_shared_info) being above 2048)\n\nLater, mac80211 layer need to add some bytes at the tail of skb\n(IEEE80211_ENCRYPT_TAILROOM \u003d 18 bytes) and since no more tailroom is\navailable has to call pskb_expand_head() and request order-1\nallocations.\n\nThis patch changes sk_stream_alloc_skb() so that only\nsk-\u003esk_prot-\u003emax_header bytes of headroom are reserved, and use a new\nskb field, avail_size to hold the data payload limit.\n\nThis way, order-0 allocations done by TCP stack can leave more than 2 KB\nof tailroom and no more allocation is performed in mac80211 layer (or\nany layer needing some tailroom)\n\navail_size is unioned with mark/dropcount, since mark will be set later\nin IP stack for output packets. Therefore, skb size is unchanged.\n\nReported-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nTested-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87151b8689d890dfb495081f7be9b9e257f7a2df", "tree": "cb12becc26090b9fd9275f25cee851ffb40d931f", "parents": [ "996304bbea3d2a094b7ba54c3bd65d3fffeac57b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 10 20:08:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 10:10:43 2012 -0400" }, "message": "net: allow pskb_expand_head() to get maximum tailroom\n\nMarc Merlin reported many order-1 allocations failures in TX path on its\nwireless setup, that dont make any sense with MTU\u003d1500 network, and non\nSG capable hardware.\n\nTurns out part of the problem comes from pskb_expand_head() not using\nksize() to get exact head size given by kmalloc(). Doing the same thing\nthan __alloc_skb() allows more tailroom in skb and can prevent future\nreallocations.\n\nAs a bonus, struct skb_shared_info becomes cache line aligned.\n\nReported-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nTested-by: Marc MERLIN \u003cmarc@merlins.org\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "996304bbea3d2a094b7ba54c3bd65d3fffeac57b", "tree": "e015e32637366870b52882e95759d5f2d4c95ba5", "parents": [ "09d208ec74b804b9dcd0b1cd9c21dfd592760807" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Wed Apr 04 01:01:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 11 09:43:13 2012 -0400" }, "message": "bridge: Do not send queries on multicast group leaves\n\nAs it stands the bridge IGMP snooping system will respond to\ngroup leave messages with queries for remaining membership.\nThis is both unnecessary and undesirable. First of all any\nmulticast routers present should be doing this rather than us.\nWhat\u0027s more the queries that we send may end up upsetting other\nmulticast snooping swithces in the system that are buggy.\n\nIn fact, we can simply remove the code that send these queries\nbecause the existing membership expiry mechanism doesn\u0027t rely\non them anyway.\n\nSo this patch simply removes all code associated with group\nqueries in response to group leave messages.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "94fb175c0414902ad9dbd956addf3a5feafbc85b", "tree": "5d3c37abe78f072e92072f2079a98303c92cf16e", "parents": [ "a9e1e53bcfb29b3b503a5e75ce498d9a64f32c1e", "a2bd1140a264b561e38d99e656cd843c2d840e86" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 15:30:16 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 10 15:30:16 2012 -0700" }, "message": "Merge tag \u0027dmaengine-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine\n\nPull dmaengine fixes from Dan Williams:\n\n1/ regression fix for Xen as it now trips over a broken assumption\n about the dma address size on 32-bit builds\n\n2/ new quirk for netdma to ignore dma channels that cannot meet\n netdma alignment requirements\n\n3/ fixes for two long standing issues in ioatdma (ring size overflow)\n and iop-adma (potential stack corruption)\n\n* tag \u0027dmaengine-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:\n netdma: adding alignment check for NETDMA ops\n ioatdma: DMA copy alignment needed to address IOAT DMA silicon errata\n ioat: ring size variables need to be 32bit to avoid overflow\n iop-adma: Corrected array overflow in RAID6 Xscale(R) test.\n ioat: fix size of \u0027completion\u0027 for Xen\n" }, { "commit": "18a223e0b9ec8979320ba364b47c9772391d6d05", "tree": "0028fe1163490ced0dcf3d72384fba0e37cf085e", "parents": [ "5fb84b1428b271f8767e0eb3fcd7231896edfaa4" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Tue Apr 10 07:59:20 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:47:09 2012 -0400" }, "message": "tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample\n\nFix a code path in tcp_rcv_rtt_update() that was comparing scaled and\nunscaled RTT samples.\n\nThe intent in the code was to only use the \u0027m\u0027 measurement if it was a\nnew minimum. However, since \u0027m\u0027 had not yet been shifted left 3 bits\nbut \u0027new_sample\u0027 had, this comparison would nearly always succeed,\nleading us to erroneously set our receive-side RTT estimate to the \u0027m\u0027\nsample when that sample could be nearly 8x too high to use.\n\nThe overall effect is to often cause the receive-side RTT estimate to\nbe significantly too large (up to 40% too large for brief periods in\nmy tests).\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5fb84b1428b271f8767e0eb3fcd7231896edfaa4", "tree": "4e27fb488ee9a0ecc4fca1c736dc5415cebbe59c", "parents": [ "ecd159fc5f415fa742d5daa5b43200606e6ad493" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 10 00:56:42 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:39:26 2012 -0400" }, "message": "tcp: restore correct limit\n\nCommit c43b874d5d714f (tcp: properly initialize tcp memory limits) tried\nto fix a regression added in commits 4acb4190 \u0026 3dc43e3,\nbut still get it wrong.\n\nResult is machines with low amount of memory have too small tcp_rmem[2]\nvalue and slow tcp receives : Per socket limit being 1/1024 of memory\ninstead of 1/128 in old kernels, so rcv window is capped to small\nvalues.\n\nFix this to match comment and previous behavior.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Jason Wang \u003cjasowang@redhat.com\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ecd159fc5f415fa742d5daa5b43200606e6ad493", "tree": "3f2996088bdf0d275d6b5fdb3cc184f80a12e21f", "parents": [ "f68e556e23d1a4176b563bcb25d8baf2c5313f91", "6ba900676bec8baaf61aa2f85b7345c0e65774d9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:38:31 2012 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 10 14:38:31 2012 -0400" }, "message": "Merge branch \u0027master\u0027 of git://1984.lsi.us.es/net\n" }, { "commit": "6ba900676bec8baaf61aa2f85b7345c0e65774d9", "tree": "7074065c1308041ec4d4a99f51dda2290aed9bca", "parents": [ "07153c6ec074257ade76a461429b567cff2b3a1e" ], "author": { "name": "Gao feng", "email": "gaofeng@cn.fujitsu.com", "time": "Sat Apr 07 16:08:28 2012 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 10 13:00:38 2012 +0200" }, "message": "netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net\n\nin function nf_conntrack_init_net,when nf_conntrack_timeout_init falied,\nwe should call nf_conntrack_ecache_fini to do rollback.\nbut the current code calls nf_conntrack_timeout_fini.\n\nSigned-off-by: Gao feng \u003cgaofeng@cn.fujitsu.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "07153c6ec074257ade76a461429b567cff2b3a1e", "tree": "ca918b6b18835b650ad4a9fed8bc08b1e6c6d273", "parents": [ "8430eac2f6a3c2adce22d490e2ab8bb50d59077a" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Apr 03 22:02:01 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 10 12:50:49 2012 +0200" }, "message": "netfilter: nf_ct_ipv4: packets with wrong ihl are invalid\n\nIt was reported that the Linux kernel sometimes logs:\n\nklogd: [2629147.402413] kernel BUG at net / netfilter /\nnf_conntrack_proto_tcp.c: 447!\nklogd: [1072212.887368] kernel BUG at net / netfilter /\nnf_conntrack_proto_tcp.c: 392\n\nipv4_get_l4proto() in nf_conntrack_l3proto_ipv4.c and tcp_error() in\nnf_conntrack_proto_tcp.c should catch malformed packets, so the errors\nat the indicated lines - TCP options parsing - should not happen.\nHowever, tcp_error() relies on the \"dataoff\" offset to the TCP header,\ncalculated by ipv4_get_l4proto(). But ipv4_get_l4proto() does not check\nbogus ihl values in IPv4 packets, which then can slip through tcp_error()\nand get caught at the TCP options parsing routines.\n\nThe patch fixes ipv4_get_l4proto() by invalidating packets with bogus\nihl value.\n\nThe patch closes netfilter bugzilla id 771.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "8430eac2f6a3c2adce22d490e2ab8bb50d59077a", "tree": "0513c19811d4a34a122155351ee5728572ddadaf", "parents": [ "95ad2f873d5d404dc9ebc2377de0b762346346c0" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Mon Apr 09 16:32:16 2012 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Apr 10 00:38:34 2012 +0200" }, "message": "netfilter: nf_ct_ipv4: handle invalid IPv4 and IPv6 packets consistently\n\nIPv6 conntrack marked invalid packets as INVALID and let the user\ndrop those by an explicit rule, while IPv4 conntrack dropped such\npackets itself.\n\nIPv4 conntrack is changed so that it marks INVALID packets and let\nthe user to drop them.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" } ], "next": "7ab2485b69571a3beb0313c591486626c3374c85" }