)]}' { "log": [ { "commit": "ae1f18e480c83d15539fb234a2dc5f0aa04cb119", "tree": "7caaf3d0cbc08b455fa3851f305a0187b4a617da", "parents": [ "605b4afec8e51d0603089eac01a3ca9dd919e909" ], "author": { "name": "Paul E. McKenney", "email": "paul.mckenney@linaro.org", "time": "Fri Jan 06 17:10:37 2012 -0800" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Feb 21 09:03:33 2012 -0800" }, "message": "mac80211: Convert call_rcu() to kfree_rcu(), drop mesh_gate_node_reclaim()\n\nThe call_rcu() in mesh_gate_del() invokes mesh_gate_node_reclaim(),\nwhich simply calls kfree(). So convert the call_rcu() to kfree_rcu(),\nallowing mesh_gate_node_reclaim() to be eliminated.\n\nSigned-off-by: Paul E. McKenney \u003cpaul.mckenney@linaro.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: \"John W. Linville\" \u003clinville@tuxdriver.com\u003e\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: linux-wireless@vger.kernel.org\nCc: netdev@vger.kernel.org\n" }, { "commit": "605b4afec8e51d0603089eac01a3ca9dd919e909", "tree": "7b57719cd58c9cbce4294eaa7c58afb09fce3829", "parents": [ "4f9c8c1b091628a550b70ee51d7d729187f5c290" ], "author": { "name": "Paul E. McKenney", "email": "paul.mckenney@linaro.org", "time": "Fri Jan 06 17:08:33 2012 -0800" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Feb 21 09:03:32 2012 -0800" }, "message": "ipv4: Convert call_rcu() to kfree_rcu(), drop opt_kfree_rcu\n\nThe call_rcu() in do_ip_setsockopt() invokes opt_kfree_rcu(), which just\ncalls kfree(). So convert the call_rcu() to kfree_rcu(), which allows\nopt_kfree_rcu() to be eliminated.\n\nSigned-off-by: Paul E. McKenney \u003cpaul.mckenney@linaro.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Alexey Kuznetsov \u003ckuznet@ms2.inr.ac.ru\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: netdev@vger.kernel.org\n" }, { "commit": "4f9c8c1b091628a550b70ee51d7d729187f5c290", "tree": "2ce74534f850815825cd047882a166d17e82f028", "parents": [ "a6c76da8f8b4549ccec7425ba94d8395d68a2e56" ], "author": { "name": "Paul E. McKenney", "email": "paul.mckenney@linaro.org", "time": "Fri Jan 06 17:06:11 2012 -0800" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Tue Feb 21 09:03:31 2012 -0800" }, "message": "ipv4: Convert call_rcu() to kfree_rcu(), drop opt_kfree_rcu()\n\nBecause opt_kfree_rcu() just calls kfree(), all call_rcu() uses of it\nmay be converted to kfree_rcu(). This permits opt_kfree_rcu() to\nbe eliminated.\n\nSigned-off-by: Paul E. McKenney \u003cpaul.mckenney@linaro.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Alexey Kuznetsov \u003ckuznet@ms2.inr.ac.ru\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nCc: netdev@vger.kernel.org\n" }, { "commit": "33b5d30cd8b200024d55ac5830c9efde1102ef4c", "tree": "4788d50ad6994a40bda8e146db4ca9674a482b92", "parents": [ "3013dc0cceb9baaf25d5624034eeaa259bf99004", "c27111e5b8d6b1e9296f7075cdc35872f672b524" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 15 13:41:52 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 15 13:41:52 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "58e05f357a039a94aa36475f8c110256f693a239", "tree": "c9f03ac6514a6e4de646880be1f2e6d7764b8fea", "parents": [ "f65bd5ec47a4461bc575d5d34902fd18b6ec5542" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Feb 14 10:11:59 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 14 15:24:26 2012 -0500" }, "message": "netpoll: netpoll_poll_dev() should access dev-\u003eflags\n\ncommit 5a698af53f (bond: service netpoll arp queue on master device)\ntested IFF_SLAVE flag against dev-\u003epriv_flags instead of dev-\u003eflags\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: WANG Cong \u003camwang@redhat.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f65bd5ec47a4461bc575d5d34902fd18b6ec5542", "tree": "a3620efc993f54214badf3c9b738a00aab840087", "parents": [ "fc543637525b59af38af2ce09a4dbdd7d5eb27bf" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Mon Feb 13 20:19:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 14 14:41:55 2012 -0500" }, "message": "RxRPC: Fix kcalloc parameters swapped\n\nThe first parameter should be \"number of elements\" and the second parameter\nshould be \"element size\".\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0af2a0d0576205dda778d25c6c344fc6508fc81d", "tree": "3f3b3d70ed8d614c2b64ddeaaac27f526e844497", "parents": [ "fbcf88b8833ce2c404b9a0e7caab82b20312cbbc" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Mon Feb 13 20:22:08 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 14 14:38:57 2012 -0500" }, "message": "tcp: fix tcp_shifted_skb() adjustment of lost_cnt_hint for FACK\n\nThis commit ensures that lost_cnt_hint is correctly updated in\ntcp_shifted_skb() for FACK TCP senders. The lost_cnt_hint adjustment\nin tcp_sacktag_one() only applies to non-FACK senders, so FACK senders\nneed their own adjustment.\n\nThis applies the spirit of 1e5289e121372a3494402b1b131b41bfe1cf9b7f -\nexcept now that the sequence range passed into tcp_sacktag_one() is\ncorrect we need only have a special case adjustment for FACK.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "daef52bab1fd26e24e8e9578f8fb33ba1d0cb412", "tree": "93c2cb04a8861280aefcb94961e81e4d5a580095", "parents": [ "cc9a672ee522d4805495b98680f4a3db5d0a0af9" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Sun Feb 12 18:37:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 13 01:00:22 2012 -0500" }, "message": "tcp: fix range tcp_shifted_skb() passes to tcp_sacktag_one()\n\nFix the newly-SACKed range to be the range of newly-shifted bytes.\n\nPreviously - since 832d11c5cd076abc0aa1eaf7be96c81d1a59ce41 -\ntcp_shifted_skb() incorrectly called tcp_sacktag_one() with the start\nand end sequence numbers of the skb it passes in set to the range just\nbeyond the range that is newly-SACKed.\n\nThis commit also removes a special-case adjustment to lost_cnt_hint in\ntcp_shifted_skb() since the pre-existing adjustment of lost_cnt_hint\nin tcp_sacktag_one() now properly handles this things now that the\ncorrect start sequence number is passed in.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc9a672ee522d4805495b98680f4a3db5d0a0af9", "tree": "391c58df73783b8b662f638e14e1f48aa83578e4", "parents": [ "8df54d622a120058ee8bec38743c9b8f091c8e58" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Sun Feb 12 18:37:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 13 01:00:21 2012 -0500" }, "message": "tcp: allow tcp_sacktag_one() to tag ranges not aligned with skbs\n\nThis commit allows callers of tcp_sacktag_one() to pass in sequence\nranges that do not align with skb boundaries, as tcp_shifted_skb()\nneeds to do in an upcoming fix in this patch series.\n\nIn fact, now tcp_sacktag_one() does not need to depend on an input skb\nat all, which makes its semantics and dependencies more clear.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8df54d622a120058ee8bec38743c9b8f091c8e58", "tree": "559dc9788cff370bed7b36d61f77708ff4efbaa7", "parents": [ "612b8507c5d545feed2437b3d2239929cac7688d", "70620c46ac2b45c24b0f22002fdf5ddd1f7daf81" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 14:18:46 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 10 14:18:46 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nQuoth David:\n\n1) GRO MAC header comparisons were ethernet specific, breaking other\n link types. This required a multi-faceted fix to cure the originally\n noted case (Infiniband), because IPoIB was lying about it\u0027s actual\n hard header length. Thanks to Eric Dumazet, Roland Dreier, and\n others.\n\n2) Fix build failure when INET_UDP_DIAG is built in and ipv6 is modular.\n From Anisse Astier.\n\n3) Off by ones and other bug fixes in netprio_cgroup from Neil Horman.\n\n4) ipv4 TCP reset generation needs to respect any network interface\n binding from the socket, otherwise route lookups might give a\n different result than all the other segments received. From Shawn\n Lu.\n\n5) Fix unintended regression in ipv4 proxy ARP responses, from Thomas\n Graf.\n\n6) Fix SKB under-allocation bug in sh_eth, from Yoshihiro Shimoda.\n\n7) Revert skge PCI mapping changes that are causing crashes for some\n folks, from Stephen Hemminger.\n\n8) IPV4 route lookups fill in the wildcarded fields of the given flow\n lookup key passed in, which is fine most of the time as this is\n exactly what the caller\u0027s want. However there are a few cases that\n want to retain the original flow key values afterwards, so handle\n those cases properly. Fix from Julian Anastasov.\n\n9) IGB/IXGBE VF lookup bug fixes from Greg Rose.\n\n10) Properly null terminate filename passed to ethtool flash device\n method, from Ben Hutchings.\n\n11) S3 resume fix in via-velocity from David Lv.\n\n12) Fix double SKB free during xmit failure in CAIF, from Dmitry\n Tarnyagin.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (72 commits)\n net: Don\u0027t proxy arp respond if iif \u003d\u003d rt-\u003edst.dev if private VLAN is disabled\n ipv4: Fix wrong order of ip_rt_get_source() and update iph-\u003edaddr.\n netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP\u003dm\n netprio_cgroup: don\u0027t allocate prio table when a device is registered\n netprio_cgroup: fix an off-by-one bug\n bna: fix error handling of bnad_get_flash_partition_by_offset()\n isdn: type bug in isdn_net_header()\n net: Make qdisc_skb_cb upper size bound explicit.\n ixgbe: ethtool: stats user buffer overrun\n ixgbe: dcb: up2tc mapping lost on disable/enable CEE DCB state\n ixgbe: do not update real num queues when netdev is going away\n ixgbe: Fix broken dependency on MAX_SKB_FRAGS being related to page size\n ixgbe: Fix case of Tx Hang in PF with 32 VFs\n ixgbe: fix vf lookup\n igb: fix vf lookup\n e1000: add dropped DMA receive enable back in for WoL\n gro: more generic L2 header check\n IPoIB: Stop lying about hard_header_len and use skb-\u003ecb to stash LL addresses\n zd1211rw: firmware needs duration_id set to zero for non-pspoll frames\n net: enable TC35815 for MIPS again\n ...\n" }, { "commit": "70620c46ac2b45c24b0f22002fdf5ddd1f7daf81", "tree": "1ca143be17f6c1e78b7740c5bb2a4a12b0d059a2", "parents": [ "5dc7883f2a7c25f8df40d7479687153558cd531b" ], "author": { "name": "Thomas Graf", "email": "tgraf@suug.ch", "time": "Fri Feb 10 04:07:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 10 15:13:36 2012 -0500" }, "message": "net: Don\u0027t proxy arp respond if iif \u003d\u003d rt-\u003edst.dev if private VLAN is disabled\n\nCommit 653241 (net: RFC3069, private VLAN proxy arp support) changed\nthe behavior of arp proxy to send arp replies back out on the interface\nthe request came in even if the private VLAN feature is disabled.\n\nPreviously we checked rt-\u003edst.dev !\u003d skb-\u003edev for in scenarios, when\nproxy arp is enabled on for the netdevice and also when individual proxy\nneighbour entries have been added.\n\nThis patch adds the check back for the pneigh_lookup() scenario.\n\nSigned-off-by: Thomas Graf \u003ctgraf@suug.ch\u003e\nAcked-by: Jesper Dangaard Brouer \u003chawk@comx.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5dc7883f2a7c25f8df40d7479687153558cd531b", "tree": "8f105bb70f72675e6bc4e2bc7516856fb21e24c0", "parents": [ "2b73bc65e2771372c818db7955709c8caedbf8b9" ], "author": { "name": "Li Wei", "email": "lw@cn.fujitsu.com", "time": "Thu Feb 09 21:15:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 10 15:12:12 2012 -0500" }, "message": "ipv4: Fix wrong order of ip_rt_get_source() and update iph-\u003edaddr.\n\nThis patch fix a bug which introduced by commit ac8a4810 (ipv4: Save\nnexthop address of LSRR/SSRR option to IPCB.).In that patch, we saved\nthe nexthop of SRR in ip_option-\u003enexthop and update iph-\u003edaddr until\nwe get to ip_forward_options(), but we need to update it before\nip_rt_get_source(), otherwise we may get a wrong src.\n\nSigned-off-by: Li Wei \u003clw@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2b73bc65e2771372c818db7955709c8caedbf8b9", "tree": "4cd1bfe8284d9266d45f5de11e3f4d8fbfcdbf4f", "parents": [ "f5c38208d32412d72b97a4f0d44af0eb39feb20b" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Feb 10 05:43:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 10 15:08:57 2012 -0500" }, "message": "netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP\u003dm\n\nWhen the netprio_cgroup module is not loaded, net_prio_subsys_id\nis -1, and so sock_update_prioidx() accesses cgroup_subsys array\nwith negative index subsys[-1].\n\nMake the code resembles cls_cgroup code, which is bug free.\n\nOrigionally-authored-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f5c38208d32412d72b97a4f0d44af0eb39feb20b", "tree": "66d7a30ed9ec41fc9327b9fc839eec497055c5a9", "parents": [ "a87dfe14a78501c931a4d5481efff6a809aa907d" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Feb 10 05:43:37 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 10 15:08:57 2012 -0500" }, "message": "netprio_cgroup: don\u0027t allocate prio table when a device is registered\n\nSo we delay the allocation till the priority is set through cgroup,\nand this makes skb_update_priority() faster when it\u0027s not set.\n\nThis also eliminates an off-by-one bug similar with the one fixed\nin the previous patch.\n\nOrigionally-authored-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a87dfe14a78501c931a4d5481efff6a809aa907d", "tree": "cecc481e2daed8dcd4fafabab04f51796dcbf945", "parents": [ "027a3b617c5490b5287d98921675abcbebeb32df" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Feb 10 05:43:36 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 10 15:08:56 2012 -0500" }, "message": "netprio_cgroup: fix an off-by-one bug\n\n# mount -t cgroup xxx /mnt\n # mkdir /mnt/tmp\n # cat /mnt/tmp/net_prio.ifpriomap\n lo 0\n eth0 0\n virbr0 0\n # echo \u0027lo 999\u0027 \u003e /mnt/tmp/net_prio.ifpriomap\n # cat /mnt/tmp/net_prio.ifpriomap\n lo 999\n eth0 0\n virbr0 4101267344\n\nWe got weired output, because we exceeded the boundary of the array.\nWe may even crash the kernel..\n\nOrigionally-authored-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b57e6b560fc2a2742910ac5ca0eb2c46e45aeac2", "tree": "f658087c4d280d8887b4f5e8a90be3380eb61136", "parents": [ "e81a7bd55531a77d8c16d44766db4089c2983f1b" ], "author": { "name": "Mohammed Shafi Shajakhan", "email": "mohammed@qca.qualcomm.com", "time": "Thu Feb 09 19:59:43 2012 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Feb 09 15:16:04 2012 -0500" }, "message": "mac80211: Fix a rwlock bad magic bug\n\nread_lock(\u0026tpt_trig-\u003etrig.leddev_list_lock) is accessed via the path\nieee80211_open (-\u003e) ieee80211_do_open (-\u003e) ieee80211_mod_tpt_led_trig\n(-\u003e) ieee80211_start_tpt_led_trig (-\u003e) tpt_trig_timer before initializing\nit.\nthe intilization of this read/write lock happens via the path\nieee80211_led_init (-\u003e) led_trigger_register, but we are doing\n\u0027ieee80211_led_init\u0027 after \u0027ieeee80211_if_add\u0027 where we\nregister netdev_ops.\nso we access leddev_list_lock before initializing it and causes the\nfollowing bug in chrome laptops with AR928X cards with the following\nscript\n\nwhile true\ndo\nsudo modprobe -v ath9k\nsleep 3\nsudo modprobe -r ath9k\nsleep 3\ndone\n\n\tBUG: rwlock bad magic on CPU#1, wpa_supplicant/358, f5b9eccc\n\tPid: 358, comm: wpa_supplicant Not tainted 3.0.13 #1\n\tCall Trace:\n\n\t[\u003c8137b9df\u003e] rwlock_bug+0x3d/0x47\n\t[\u003c81179830\u003e] do_raw_read_lock+0x19/0x29\n\t[\u003c8137f063\u003e] _raw_read_lock+0xd/0xf\n\t[\u003cf9081957\u003e] tpt_trig_timer+0xc3/0x145 [mac80211]\n\t[\u003cf9081f3a\u003e] ieee80211_mod_tpt_led_trig+0x152/0x174 [mac80211]\n\t[\u003cf9076a3f\u003e] ieee80211_do_open+0x11e/0x42e [mac80211]\n\t[\u003cf9075390\u003e] ? ieee80211_check_concurrent_iface+0x26/0x13c [mac80211]\n\t[\u003cf9076d97\u003e] ieee80211_open+0x48/0x4c [mac80211]\n\t[\u003c812dbed8\u003e] __dev_open+0x82/0xab\n\t[\u003c812dc0c9\u003e] __dev_change_flags+0x9c/0x113\n\t[\u003c812dc1ae\u003e] dev_change_flags+0x18/0x44\n\t[\u003c8132144f\u003e] devinet_ioctl+0x243/0x51a\n\t[\u003c81321ba9\u003e] inet_ioctl+0x93/0xac\n\t[\u003c812cc951\u003e] sock_ioctl+0x1c6/0x1ea\n\t[\u003c812cc78b\u003e] ? might_fault+0x20/0x20\n\t[\u003c810b1ebb\u003e] do_vfs_ioctl+0x46e/0x4a2\n\t[\u003c810a6ebb\u003e] ? fget_light+0x2f/0x70\n\t[\u003c812ce549\u003e] ? sys_recvmsg+0x3e/0x48\n\t[\u003c810b1f35\u003e] sys_ioctl+0x46/0x69\n\t[\u003c8137fa77\u003e] sysenter_do_call+0x12/0x2\n\nCc: \u003cstable@vger.kernel.org\u003e\nCc: Gary Morain \u003cgmorain@google.com\u003e\nCc: Paul Stewart \u003cpstew@google.com\u003e\nCc: Abhijit Pradhan \u003cabhijit@qca.qualcomm.com\u003e\nCc: Vasanthakumar Thiagarajan \u003cvthiagar@qca.qualcomm.com\u003e\nCc: Rajkumar Manoharan \u003crmanohar@qca.qualcomm.com\u003e\nAcked-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nTested-by: Mohammed Shafi Shajakhan \u003cmohammed@qca.qualcomm.com\u003e\nSigned-off-by: Mohammed Shafi Shajakhan \u003cmohammed@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "16bda13d90c8d5da243e2cfa1677e62ecce26860", "tree": "d10c9e0f9b043170c5bba4599ab1dc006d2a76eb", "parents": [ "9cc00b51a3cbb3b933065a55eaa9bfc306411b7a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Feb 06 15:14:37 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 09 13:50:34 2012 -0500" }, "message": "net: Make qdisc_skb_cb upper size bound explicit.\n\nJust like skb-\u003ecb[], so that qdisc_skb_cb can be encapsulated inside\nof other data structures.\n\nThis is intended to be used by IPoIB so that it can remember\naddressing information stored at hard_header_ops-\u003ecreate() time that\nit can fetch when the packet gets to the transmit routine.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5ca3b72c5da47d95b83857b768def6172fbc080a", "tree": "9e1dab3a4e055c313aae8b78747d08c201dc91b6", "parents": [ "936d7de3d736e0737542641269436f4b5968e9ef" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Feb 08 08:51:50 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 08 18:26:54 2012 -0500" }, "message": "gro: more generic L2 header check\n\nShlomo Pongratz reported GRO L2 header check was suited for Ethernet\nonly, and failed on IB/ipoib traffic.\n\nHe provided a patch faking a zeroed header to let GRO aggregates frames.\n\nRoland Dreier, Herbert Xu, and others suggested we change GRO L2 header\ncheck to be more generic, ie not assuming L2 header is 14 bytes, but\ntaking into account hard_header_len.\n\n__napi_gro_receive() has special handling for the common case (Ethernet)\nto avoid a memcmp() call and use an inline optimized function instead.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nReported-by: Shlomo Pongratz \u003cshlomop@mellanox.com\u003e\nCc: Roland Dreier \u003croland@kernel.org\u003e\nCc: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nTested-by: Sean Hefty \u003csean.hefty@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6d25886ee2fbc05a7bf4dae5f5ae345cb73df2fd", "tree": "a474640348866b4b7f7ba14bb52978f5963191c0", "parents": [ "3f61cd879c2f112c468e8849949b6fc88c739679" ], "author": { "name": "Anisse Astier", "email": "anisse@astier.eu", "time": "Tue Feb 07 07:39:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 07 13:35:28 2012 -0500" }, "message": "net: Fix build regression when INET_UDP_DIAG\u003dy and IPV6\u003dm\n\nTested-by: Anisse Astier \u003canisse@astier.eu\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e2446eaab5585555a38ea0df4e01ff313dbb4ac9", "tree": "58bf7212d6bebd30ec6477f84440cbbd8dbb3bb1", "parents": [ "5962b35c1de3254a2f03b95efd3b7854b874d7b7" ], "author": { "name": "Shawn Lu", "email": "shawn.lu@ericsson.com", "time": "Sat Feb 04 12:38:09 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 04 18:20:05 2012 -0500" }, "message": "tcp_v4_send_reset: binding oif to iif in no sock case\n\nBinding RST packet outgoing interface to incoming interface\nfor tcp v4 when there is no socket associate with it.\nwhen sk is not NULL, using sk-\u003esk_bound_dev_if instead.\n(suggested by Eric Dumazet).\n\nThis has few benefits:\n1. tcp_v6_send_reset already did that.\n2. This helps tcp connect with SO_BINDTODEVICE set. When\nconnection is lost, we still able to sending out RST using\nsame interface.\n3. we are sending reply, it is most likely to be succeed\nif iif is used\n\nSigned-off-by: Shawn Lu \u003cshawn.lu@ericsson.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5962b35c1de3254a2f03b95efd3b7854b874d7b7", "tree": "f085176f6441a32782294dccdd52336c58b0ba5f", "parents": [ "1715322f3e0600b664fa8b780a07de104f49c104" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Fri Feb 03 05:18:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Feb 04 16:30:24 2012 -0500" }, "message": "netprio_cgroup: Fix obo in get_prioidx\n\nIt was recently pointed out to me that the get_prioidx function sets a bit in\nthe prioidx map prior to checking to see if the index being set is out of\nbounds. This patch corrects that, avoiding the possiblity of us writing beyond\nthe end of the array\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nReported-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nCC: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "157ca9eae92bc5247f93bea4ecb50dfacc283a04", "tree": "2bf88c36d1a7513c3dbb2babd6feb64ed2ce558c", "parents": [ "29830406415c227a54af429d7b300aabd4754237", "07ae2dfcf4f7143ce191c6436da1c33f179af0d6" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Feb 03 14:14:07 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Feb 03 14:14:07 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "6c073a7ee250118b8be3a2379c96fd7f78382b06", "tree": "b398bd9cad821a3543df835e5a0110f270acafb9", "parents": [ "ff05f603c3238010769787f3ba54c48c290ed3e5", "d23a4b3fd6ef70b80411b39b8c8bc548a219ce70" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 15:47:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 02 15:47:33 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n rbd: fix safety of rbd_put_client()\n rbd: fix a memory leak in rbd_get_client()\n ceph: create a new session lock to avoid lock inversion\n ceph: fix length validation in parse_reply_info()\n ceph: initialize client debugfs outside of monc-\u003emutex\n ceph: change \"ceph.layout\" xattr to be \"ceph.file.layout\"\n" }, { "commit": "ab434b60ab07f8c44246b6fb0cddee436687a09a", "tree": "2a680aca91c4906f28cda57093ac76b1e588de5d", "parents": [ "114fc47492e23d93653e4a16664833e98d62a563" ], "author": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Fri Jan 13 22:22:03 2012 -0800" }, "committer": { "name": "Sage Weil", "email": "sage@newdream.net", "time": "Thu Feb 02 12:49:01 2012 -0800" }, "message": "ceph: initialize client debugfs outside of monc-\u003emutex\n\nInitializing debufs under monc-\u003emutex introduces a lock dependency for\nsb-\u003es_type-\u003ei_mutex_key, which (combined with several other dependencies)\nleads to an annoying lockdep warning. There\u0027s no particular reason to do\nthe debugfs setup under this lock, so move it out.\n\nIt used to be the case that our first monmap could come from the OSD; that\nis no longer the case with recent servers, so we will reliably set up the\nclient entry during the initial authentication.\n\nWe don\u0027t have to worry about racing with debugfs teardown by\nceph_debugfs_client_cleanup() because ceph_destroy_client() calls\nceph_msgr_flush() first, which will wait for the message dispatch work\nto complete (and the debugfs init to complete).\n\nFixes: #1940\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\n" }, { "commit": "ba7605745d5c99f0e71b3ec6c7cb5ed6afe540ad", "tree": "24f678ef44d316b79d6301ed3ffde26258d6f2ac", "parents": [ "b01377a4200d0dfc7b04a8daabb4739727353703" ], "author": { "name": "Dmitry Tarnyagin", "email": "dmitry.tarnyagin@stericsson.com", "time": "Thu Feb 02 01:21:03 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 02 14:35:12 2012 -0500" }, "message": "caif: Bugfix double kfree_skb upon xmit failure\n\nSKB is freed twice upon send error. The Network stack consumes SKB even\nwhen it returns error code.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b01377a4200d0dfc7b04a8daabb4739727353703", "tree": "2c1eef3ae76495872c2b55459c318e9a905c479f", "parents": [ "c31c151b1c4a29da4dc92212aa8648fb4f8557b9" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Thu Feb 02 01:21:02 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 02 14:35:12 2012 -0500" }, "message": "caif: Bugfix list_del_rcu race in cfmuxl_ctrlcmd.\n\nAlways use cfmuxl_remove_uplayer when removing a up-layer.\ncfmuxl_ctrlcmd() can be called independently and in parallel with\ncfmuxl_remove_uplayer(). The race between them could cause list_del_rcu\nto be called on a node which has been already taken out from the list.\nThat lead to a (rare) crash on accessing poisoned node-\u003eprev inside\nlist_del_rcu.\n\nThis fix ensures that deletion are done holding the same lock.\n\nReported-by: Dmitry Tarnyagin \u003cdmitry.tarnyagin@stericsson.com\u003e\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c43b874d5d714f271b80d4c3f49e05d0cbf51ed2", "tree": "c56f3500327b081228d4c7369d39740e9bb4a0a9", "parents": [ "786f528119722f564a22ad953411374e06116333" ], "author": { "name": "Jason Wang", "email": "jasowang@redhat.com", "time": "Thu Feb 02 00:07:00 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Feb 02 14:34:41 2012 -0500" }, "message": "tcp: properly initialize tcp memory limits\n\nCommit 4acb4190 tries to fix the using uninitialized value\nintroduced by commit 3dc43e3, but it would make the\nper-socket memory limits too small.\n\nThis patch fixes this and also remove the redundant codes\nintroduced in 4acb4190.\n\nSigned-off-by: Jason Wang \u003cjasowang@redhat.com\u003e\nAcked-by: Glauber Costa \u003cglommer@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "07ae2dfcf4f7143ce191c6436da1c33f179af0d6", "tree": "c18ff3f0f4967bee6bf741bcbc703809d73252c9", "parents": [ "3d29dd9b5b160ba4542a9b8f869a220559e633a0" ], "author": { "name": "Eliad Peller", "email": "eliad@wizery.com", "time": "Wed Feb 01 18:48:09 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Feb 01 15:26:00 2012 -0500" }, "message": "mac80211: timeout a single frame in the rx reorder buffer\n\nThe current code checks for stored_mpdu_num \u003e 1, causing\nthe reorder_timer to be triggered indefinitely, but the\nframe is never timed-out (until the next packet is received)\n\nSigned-off-by: Eliad Peller \u003celiad@wizery.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "786f528119722f564a22ad953411374e06116333", "tree": "122ca6128b967fc4e91ff9a974181536a55f64ed", "parents": [ "efcdbf24fd5daa88060869e51ed49f68b7ac8708" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Wed Feb 01 09:32:25 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 01 14:47:17 2012 -0500" }, "message": "ethtool: Null-terminate filename passed to ethtool_ops::flash_device\n\nThe parameters for ETHTOOL_FLASHDEV include a filename, which ought to\nbe null-terminated. Currently the only driver that implements\nethtool_ops::flash_device attempts to add a null terminator if\nnecessary, but does it wrongly. Do it in the ethtool core instead.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "efcdbf24fd5daa88060869e51ed49f68b7ac8708", "tree": "8c771a1ef2c93f1ba959709d6ffb4fd56af53699", "parents": [ "48c3883999cb06246911e29356d194f96f1c75ef" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Mon Jan 30 14:16:06 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 01 14:41:50 2012 -0500" }, "message": "net: Disambiguate kernel message\n\nSome of our machines were reporting:\n\nTCP: too many of orphaned sockets\n\neven when the number of orphaned sockets was well below the\nlimit.\n\nWe print a different message depending on whether we\u0027re out\nof TCP memory or there are too many orphaned sockets.\n\nAlso move the check out of line and cleanup the messages\nthat were printed.\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nSuggested-by: Mohan Srinivasan \u003cmohan@fb.com\u003e\nCc: netdev@vger.kernel.org\nCc: linux-kernel@vger.kernel.org\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a14a8d93169a8f2b0b000891571659ddbfa3a169", "tree": "36efa74c6f8c635079a8c3e057d25622282f4578", "parents": [ "b527a2331b873b8bf0549a45fc1ff635dd230d15", "6f01fd6e6f6809061b56e78f1e8d143099716d70" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 10:53:20 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 10:53:20 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n1) Setting link attributes can modify the size of the attributes that\n would be reported on a subsequent getlink netlink operation,\n therefore min_ifinfo_dump_size needs to be adjusted. From Stefan\n Gula.\n\n2) Resegmentation of TSO frames while trimming can violate invariants\n expected by callers, namely that the number of segments can only stay\n the same or decrease, never increase. If MSS changes, however, we\n can trim data but then end up with more segments. Fix this by only\n segmenting to the MSS already recorded in the SKB. That\u0027s the\n simplest fix for now and if we want to get more fancy in the future\n that\u0027s a more involved change.\n\n This probably explains some retransmit counter inaccuracies.\n\n From Neal Cardwell.\n\n3) Fix too-many-wakeups in POLL with AF_UNIX sockets, from Eric Dumazet.\n\n4) Fix CAIF crashes wrt. namespace handling. From Eric Dumazet and\n Eric W. Biederman.\n\n5) TCP port selection fixes from Flavio Leitner.\n\n6) More socket memory cgroup build fixes in certain randonfig\n situations. From Glauber Costa.\n\n7) Fix TCP memory sysctl regression reported by Ingo Molnar, also from\n Glauber Costa.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n af_unix: fix EPOLLET regression for stream sockets\n tcp: fix tcp_trim_head() to adjust segment count with skb MSS\n net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL\n net caif: Register properly as a pernet subsystem.\n netns: Fail conspicously if someone uses net_generic at an inappropriate time.\n net: explicitly add jump_label.h header to sock.h\n net: RTNETLINK adjusting values of min_ifinfo_dump_size\n ipv6: Fix ip_gre lockless xmits.\n xen-netfront: correct MAX_TX_TARGET calculation.\n netns: fix net_alloc_generic()\n tcp: bind() optimize port allocation\n tcp: bind() fix autoselection to share ports\n l2tp: l2tp_ip - fix possible oops on packet receive\n iwlwifi: fix PCI-E transport \"inta\" race\n mac80211: set bss_conf.idle when vif is connected\n mac80211: update oper_channel on ibss join\n" }, { "commit": "6f01fd6e6f6809061b56e78f1e8d143099716d70", "tree": "bd6b09a01a5f1af65fc12c6ac533f2b1f4caa777", "parents": [ "5b35e1e6e9ca651e6b291c96d1106043c9af314a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sat Jan 28 16:11:03 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 30 12:45:07 2012 -0500" }, "message": "af_unix: fix EPOLLET regression for stream sockets\n\nCommit 0884d7aa24 (AF_UNIX: Fix poll blocking problem when reading from\na stream socket) added a regression for epoll() in Edge Triggered mode\n(EPOLLET)\n\nAppropriate fix is to use skb_peek()/skb_unlink() instead of\nskb_dequeue(), and only call skb_unlink() when skb is fully consumed.\n\nThis remove the need to requeue a partial skb into sk_receive_queue head\nand the extra sk-\u003esk_data_ready() calls that added the regression.\n\nThis is safe because once skb is given to sk_receive_queue, it is not\nmodified by a writer, and readers are serialized by u-\u003ereadlock mutex.\n\nThis also reduce number of spinlock acquisition for small reads or\nMSG_PEEK users so should improve overall performance.\n\nReported-by: Nick Mathewson \u003cnickm@freehaven.net\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Alexey Moiseytsev \u003chimeraster@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5b35e1e6e9ca651e6b291c96d1106043c9af314a", "tree": "d18caadee5e93dc45d0c5fa2c530537cfa14586c", "parents": [ "4acb41903b2f99f3dffd4c3df9acc84ca5942cb2" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Sat Jan 28 17:29:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 30 12:42:58 2012 -0500" }, "message": "tcp: fix tcp_trim_head() to adjust segment count with skb MSS\n\nThis commit fixes tcp_trim_head() to recalculate the number of\nsegments in the skb with the skb\u0027s existing MSS, so trimming the head\ncauses the skb segment count to be monotonically non-increasing - it\nshould stay the same or go down, but not increase.\n\nPreviously tcp_trim_head() used the current MSS of the connection. But\nif there was a decrease in MSS between original transmission and ACK\n(e.g. due to PMTUD), this could cause tcp_trim_head() to\ncounter-intuitively increase the segment count when trimming bytes off\nthe head of an skb. This violated assumptions in tcp_tso_acked() that\ntcp_trim_head() only decreases the packet count, so that packets_acked\nin tcp_tso_acked() could underflow, leading tcp_clean_rtx_queue() to\npass u32 pkts_acked values as large as 0xffffffff to\nca_ops-\u003epkts_acked().\n\nAs an aside, if tcp_trim_head() had really wanted the skb to reflect\nthe current MSS, it should have called tcp_set_skb_tso_segs()\nunconditionally, since a decrease in MSS would mean that a\nsingle-packet skb should now be sliced into multiple segments.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nAcked-by: Nandita Dukkipati \u003cnanditad@google.com\u003e\nAcked-by: Ilpo Järvinen \u003cilpo.jarvinen@helsinki.fi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4acb41903b2f99f3dffd4c3df9acc84ca5942cb2", "tree": "3a2dc1739d654effecd86749e49a40d41019e645", "parents": [ "8a8ee9aff6c3077dd9c2c7a77478e8ed362b96c6" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Mon Jan 30 01:20:17 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 30 12:41:06 2012 -0500" }, "message": "net/tcp: Fix tcp memory limits initialization when !CONFIG_SYSCTL\n\nsysctl_tcp_mem() initialization was moved to sysctl_tcp_ipv4.c\nin commit 3dc43e3e4d0b52197d3205214fe8f162f9e0c334, since it\nbecame a per-ns value.\n\nThat code, however, will never run when CONFIG_SYSCTL is\ndisabled, leading to bogus values on those fields - causing hung\nTCP sockets.\n\nThis patch fixes it by keeping an initialization code in\ntcp_init(). It will be overwritten by the first net namespace\ninit if CONFIG_SYSCTL is compiled in, and do the right thing if\nit is compiled out.\n\nIt is also named properly as tcp_init_mem(), to properly signal\nits non-sysctl side effect on TCP limits.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nLink: http://lkml.kernel.org/r/4F22D05A.8030604@parallels.com\n[ renamed the function, tidied up the changelog a bit ]\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f94f72ee673edd6cd9cd36fd954173871808873f", "tree": "c0461aa50c44fb7d3869ca2a5e467447308f85e9", "parents": [ "a51f67a4b440896dfc170ff3ce35994771b1267f", "875ad3f8e7dff6bc1d053e5bfe73d8e8d2e6ae67" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:47:49 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 30 08:47:49 2012 -0800" }, "message": "Merge tag \u0027nfs-for-3.3-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nNFS client bugfixes for Linux 3.3 (pull 3)\n\n* tag \u0027nfs-for-3.3-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n SUNRPC: Fix machine creds in generic_create_cred and generic_match\n" }, { "commit": "8a8ee9aff6c3077dd9c2c7a77478e8ed362b96c6", "tree": "bb905513ac457b8e7204056a17345ad3a5888db6", "parents": [ "5ee4433efe99b9f39f6eff5052a177bbcfe72cea" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Jan 26 14:04:53 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 27 21:06:03 2012 -0500" }, "message": "net caif: Register properly as a pernet subsystem.\n\ncaif is a subsystem and as such it needs to register with\nregister_pernet_subsys instead of register_pernet_device.\n\nAmong other problems using register_pernet_device was resulting in\nnet_generic being called before the caif_net structure was allocated.\nWhich has been causing net_generic to fail with either BUG_ON\u0027s or by\nreturn NULL pointers.\n\nA more ugly problem that could be caused is packets in flight why the\nsubsystem is shutting down.\n\nTo remove confusion also remove the cruft cause by inappropriately\ntrying to fix this bug.\n\nWith the aid of the previous patch I have tested this patch and\nconfirmed that using register_pernet_subsys makes the failure go away as\nit should.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nTested-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc0d7b91db000aef1cc12f1d3d4d7f80af9bd419", "tree": "5f0e86afb61b33658ec42b37ae739809ec98cb3d", "parents": [ "9018e93948c6f8f95fbcc9fa05f6c403d6adb406", "b49ba04a3a0382e7314d990707c21094c410425a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 27 20:40:18 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 27 20:40:18 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "f18da14565819ba43b8321237e2426a2914cc2ef", "tree": "263689dd9f9b39e6995c32e13ac725d1153a5641", "parents": [ "f2b3ee9e4200b32d113b1bd3c93f9a836c97357c" ], "author": { "name": "Stefan Gula", "email": "steweg@gmail.com", "time": "Thu Jan 26 11:01:06 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 26 16:35:57 2012 -0500" }, "message": "net: RTNETLINK adjusting values of min_ifinfo_dump_size\n\nSetting link parameters on a netdevice changes the value\nof if_nlmsg_size(), therefore it is necessary to recalculate\nmin_ifinfo_dump_size.\n\nSigned-off-by: Stefan Gula \u003csteweg@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f2b3ee9e4200b32d113b1bd3c93f9a836c97357c", "tree": "d80ac5e5fddf395762f2b31110757abf833e752e", "parents": [ "40206dd98f066d596d4280558fc5f798165861c7" ], "author": { "name": "Willem de Bruijn", "email": "willemb@google.com", "time": "Thu Jan 26 10:34:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 26 16:34:08 2012 -0500" }, "message": "ipv6: Fix ip_gre lockless xmits.\n\nTunnel devices set NETIF_F_LLTX to bypass HARD_TX_LOCK. Sit and\nipip set this unconditionally in ops-\u003esetup, but gre enables it\nconditionally after parameter passing in ops-\u003enewlink. This is\nnot called during tunnel setup as below, however, so GRE tunnels are\nstill taking the lock.\n\nmodprobe ip_gre\nip tunnel add test0 mode gre remote 10.5.1.1 dev lo\nip link set test0 up\nip addr add 10.6.0.1 dev test0\n # cat /sys/class/net/test0/features\n # $DIR/test_tunnel_xmit 10 10.5.2.1\nip route add 10.5.2.0/24 dev test0\nip tunnel del test0\n\nThe newlink callback is only called in rtnl_netlink, and only if\nthe device is new, as it calls register_netdevice internally. Gre\ntunnels are created at \u0027ip tunnel add\u0027 with ioctl SIOCADDTUNNEL,\nwhich calls ipgre_tunnel_locate, which calls register_netdev.\nrtnl_newlink is called at \u0027ip link set\u0027, but skips ops-\u003enewlink\nand the device is up with locking still enabled. The equivalent\nipip tunnel works fine, btw (just substitute \u0027method gre\u0027 for\n\u0027method ipip\u0027).\n\nOn kernels before /sys/class/net/*/features was removed [1],\nthe first commented out line returns 0x6000 with method gre,\nwhich indicates that NETIF_F_LLTX (0x1000) is not set. With ipip,\nit reports 0x7000. This test cannot be used on recent kernels where\nthe sysfs file is removed (and ETHTOOL_GFEATURES does not currently\nwork for tunnel devices, because they lack dev-\u003eethtool_ops).\n\nThe second commented out line calls a simple transmission test [2]\nthat sends on 24 cores at maximum rate. Results of a single run:\n\nipip:\t\t\t19,372,306\ngre before patch:\t 4,839,753\ngre after patch:\t19,133,873\n\nThis patch replicates the condition check in ipgre_newlink to\nipgre_tunnel_locate. It works for me, both with oseq on and off.\nThis is the first time I looked at rtnetlink and iproute2 code,\nthough, so someone more knowledgeable should probably check the\npatch. Thanks.\n\nThe tail of both functions is now identical, by the way. To avoid\ncode duplication, I\u0027ll be happy to rework this and merge the two.\n\n[1] http://patchwork.ozlabs.org/patch/104610/\n[2] http://kernel.googlecode.com/files/xmit_udp_parallel.c\n\nSigned-off-by: Willem de Bruijn \u003cwillemb@google.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "073862ba5d249c20bd5c49fc6d904ff0e1f6a672", "tree": "e2bfd8ac4565532845a7213ce33ee7abae65530a", "parents": [ "fddb7b5761f104f034a0e708ece756d9b2eb2cac" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 26 00:41:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 26 13:36:19 2012 -0500" }, "message": "netns: fix net_alloc_generic()\n\nWhen a new net namespace is created, we should attach to it a \"struct\nnet_generic\" with enough slots (even empty), or we can hit the following\nBUG_ON() :\n\n[ 200.752016] kernel BUG at include/net/netns/generic.h:40!\n...\n[ 200.752016] [\u003cffffffff825c3cea\u003e] ? get_cfcnfg+0x3a/0x180\n[ 200.752016] [\u003cffffffff821cf0b0\u003e] ? lockdep_rtnl_is_held+0x10/0x20\n[ 200.752016] [\u003cffffffff825c41be\u003e] caif_device_notify+0x2e/0x530\n[ 200.752016] [\u003cffffffff810d61b7\u003e] notifier_call_chain+0x67/0x110\n[ 200.752016] [\u003cffffffff810d67c1\u003e] raw_notifier_call_chain+0x11/0x20\n[ 200.752016] [\u003cffffffff821bae82\u003e] call_netdevice_notifiers+0x32/0x60\n[ 200.752016] [\u003cffffffff821c2b26\u003e] register_netdevice+0x196/0x300\n[ 200.752016] [\u003cffffffff821c2ca9\u003e] register_netdev+0x19/0x30\n[ 200.752016] [\u003cffffffff81c1c67a\u003e] loopback_net_init+0x4a/0xa0\n[ 200.752016] [\u003cffffffff821b5e62\u003e] ops_init+0x42/0x180\n[ 200.752016] [\u003cffffffff821b600b\u003e] setup_net+0x6b/0x100\n[ 200.752016] [\u003cffffffff821b6466\u003e] copy_net_ns+0x86/0x110\n[ 200.752016] [\u003cffffffff810d5789\u003e] create_new_namespaces+0xd9/0x190\n\nnet_alloc_generic() should take into account the maximum index into the\nptr array, as a subsystem might use net_generic() anytime.\n\nThis also reduces number of reallocations in net_assign_generic()\n\nReported-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nTested-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCc: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fddb7b5761f104f034a0e708ece756d9b2eb2cac", "tree": "f995ec889ebc1edc3fc9d3b0fe1da1fe9c2d6b76", "parents": [ "2b05ad33e1e624e7f08b8676d270dc7725403b7e" ], "author": { "name": "Flavio Leitner", "email": "fbl@redhat.com", "time": "Wed Jan 25 08:34:52 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 25 21:50:43 2012 -0500" }, "message": "tcp: bind() optimize port allocation\n\nPort autoselection finds a port and then drop the lock,\nthen right after that, gets the hash bucket again and lock it.\n\nFix it to go direct.\n\nSigned-off-by: Flavio Leitner \u003cfbl@redhat.com\u003e\nSigned-off-by: Marcelo Ricardo Leitner \u003cmleitner@redhat.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2b05ad33e1e624e7f08b8676d270dc7725403b7e", "tree": "0f180ef1fa0efcea96738315917eaa014c2ac8f0", "parents": [ "68315801dbf3ab2001679fd2074c9dc5dcf87dfa" ], "author": { "name": "Flavio Leitner", "email": "fbl@redhat.com", "time": "Wed Jan 25 08:34:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 25 21:50:43 2012 -0500" }, "message": "tcp: bind() fix autoselection to share ports\n\nThe current code checks for conflicts when the application\nrequests a specific port. If there is no conflict, then\nthe request is granted.\n\nOn the other hand, the port autoselection done by the kernel\nfails when all ports are bound even when there is a port\nwith no conflict available.\n\nThe fix changes port autoselection to check if there is a\nconflict and use it if not.\n\nSigned-off-by: Flavio Leitner \u003cfbl@redhat.com\u003e\nSigned-off-by: Marcelo Ricardo Leitner \u003cmleitner@redhat.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "68315801dbf3ab2001679fd2074c9dc5dcf87dfa", "tree": "24e7989e852b6a32f2fd980d1b6958720175f7dc", "parents": [ "701b259f446be2f3625fb852bceb93afe76e206d" ], "author": { "name": "James Chapman", "email": "jchapman@katalix.com", "time": "Wed Jan 25 02:39:05 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 25 21:45:00 2012 -0500" }, "message": "l2tp: l2tp_ip - fix possible oops on packet receive\n\nWhen a packet is received on an L2TP IP socket (L2TPv3 IP link\nencapsulation), the l2tpip socket\u0027s backlog_rcv function calls\nxfrm4_policy_check(). This is not necessary, since it was called\nbefore the skb was added to the backlog. With CONFIG_NET_NS enabled,\nxfrm4_policy_check() will oops if skb-\u003edev is null, so this trivial\npatch removes the call.\n\nThis bug has always been present, but only when CONFIG_NET_NS is\nenabled does it cause problems. Most users are probably using UDP\nencapsulation for L2TP, hence the problem has only recently\nsurfaced.\n\nEIP: 0060:[\u003cc12bb62b\u003e] EFLAGS: 00210246 CPU: 0\nEIP is at l2tp_ip_recvmsg+0xd4/0x2a7\nEAX: 00000001 EBX: d77b5180 ECX: 00000000 EDX: 00200246\nESI: 00000000 EDI: d63cbd30 EBP: d63cbd18 ESP: d63cbcf4\n DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068\nCall Trace:\n [\u003cc1218568\u003e] sock_common_recvmsg+0x31/0x46\n [\u003cc1215c92\u003e] __sock_recvmsg_nosec+0x45/0x4d\n [\u003cc12163a1\u003e] __sock_recvmsg+0x31/0x3b\n [\u003cc1216828\u003e] sock_recvmsg+0x96/0xab\n [\u003cc10b2693\u003e] ? might_fault+0x47/0x81\n [\u003cc10b2693\u003e] ? might_fault+0x47/0x81\n [\u003cc1167fd0\u003e] ? _copy_from_user+0x31/0x115\n [\u003cc121e8c8\u003e] ? copy_from_user+0x8/0xa\n [\u003cc121ebd6\u003e] ? verify_iovec+0x3e/0x78\n [\u003cc1216604\u003e] __sys_recvmsg+0x10a/0x1aa\n [\u003cc1216792\u003e] ? sock_recvmsg+0x0/0xab\n [\u003cc105a99b\u003e] ? __lock_acquire+0xbdf/0xbee\n [\u003cc12d5a99\u003e] ? do_page_fault+0x193/0x375\n [\u003cc10d1200\u003e] ? fcheck_files+0x9b/0xca\n [\u003cc10d1259\u003e] ? fget_light+0x2a/0x9c\n [\u003cc1216bbb\u003e] sys_recvmsg+0x2b/0x43\n [\u003cc1218145\u003e] sys_socketcall+0x16d/0x1a5\n [\u003cc11679f0\u003e] ? trace_hardirqs_on_thunk+0xc/0x10\n [\u003cc100305f\u003e] sysenter_do_call+0x12/0x38\nCode: c6 05 8c ea a8 c1 01 e8 0c d4 d9 ff 85 f6 74 07 3e ff 86 80 00 00 00 b9 17 b6 2b c1 ba 01 00 00 00 b8 78 ed 48 c1 e8 23 f6 d9 ff \u003cff\u003e 76 0c 68 28 e3 30 c1 68 2d 44 41 c1 e8 89 57 01 00 83 c4 0c\n\nSigned-off-by: James Chapman \u003cjchapman@katalix.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "efc3dbc37412c027e363736b4f4c74ee5e8ecffc", "tree": "958b635fa7f52456c19247e892a3d92d21a448a7", "parents": [ "36a1211970193ce215de50ed1e4e1272bc814df1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 24 17:03:44 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 24 17:03:44 2012 -0500" }, "message": "rds: Make rds_sock_lock BH rather than IRQ safe.\n\nrds_sock_info() triggers locking warnings because we try to perform a\nlocal_bh_enable() (via sock_i_ino()) while hardware interrupts are\ndisabled (via taking rds_sock_lock).\n\nThere is no reason for rds_sock_lock to be a hardware IRQ disabling\nlock, none of these access paths run in hardware interrupt context.\n\nTherefore making it a BH disabling lock is safe and sufficient to\nfix this bug.\n\nReported-by: Kumar Sanghvi \u003ckumaras@chelsio.com\u003e\nReported-by: Josh Boyer \u003cjwboyer@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c452ed70771cea3af73d21a5914989137fbd28b8", "tree": "0c307046119bf289a54e25e94f1967d513079d7a", "parents": [ "b82b9183d4f18f9b8c4bb31f223eb6c79b734eb0" ], "author": { "name": "Jesper Dangaard Brouer", "email": "hawk@comx.dk", "time": "Tue Jan 24 16:03:33 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 24 16:03:33 2012 -0500" }, "message": "net: flow_dissector.c missing include linux/export.h\n\nThe file net/core/flow_dissector.c seems to be missing\nincluding linux/export.h.\n\nSigned-off-by: Jesper Dangaard Brouer \u003chawk@comx.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "56ac11cf2f21366ad48b356f7a0d1af8cff3588e", "tree": "dd4471a9df32ddda044718d6d88cbb78cf941bea", "parents": [ "90b9a5454fd2e626aa1614fe9ece6b63a0dc37af" ], "author": { "name": "Radu Iliescu", "email": "radui@bricsys.com", "time": "Thu Jan 19 03:57:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 24 15:33:19 2012 -0500" }, "message": "llc: Fix race condition in llc_ui_recvmsg\n\nThere is a race on sk_receive_queue between llc_ui_recvmsg and\nsock_queue_rcv_skb.\n\nOur current solution is to protect skb_eat in llc_ui_recvmsg\nwith the queue spinlock.\n\nSigned-off-by: Radu Iliescu \u003criliescu@ixiacom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "405385f8ce7a2ed8f82e216d88b5282142e1288b", "tree": "fe96a1cd18291247dfd13efccf09be9334a1cc27", "parents": [ "ba1960257c5980f9b58057995ce3394bd8e48ca3" ], "author": { "name": "Eliad Peller", "email": "eliad@wizery.com", "time": "Wed Jan 11 13:11:50 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:47:09 2012 -0500" }, "message": "mac80211: set bss_conf.idle when vif is connected\n\n__ieee80211_recalc_idle() iterates through the vifs,\nsets bss_conf.idle \u003d true if they are disconnected,\nand increases \"count\" if they are not (which later\ngets evaluated in order to determine whether the\ndevice is idle).\n\nHowever, the loop doesn\u0027t set bss_conf.idle \u003d false\n(along with increasing \"count\"), causing the device\nidle state and the vif idle state to get out of sync\nin some cases.\n\nSigned-off-by: Eliad Peller \u003celiad@wizery.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ba1960257c5980f9b58057995ce3394bd8e48ca3", "tree": "9b91a56e26f268d925e6b420ccaab58dbad15625", "parents": [ "4f3d09de38d234ce7ffba5ec5a7e6704f983d375" ], "author": { "name": "Eliad Peller", "email": "eliad@wizery.com", "time": "Tue Jan 10 15:19:54 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 24 14:47:09 2012 -0500" }, "message": "mac80211: update oper_channel on ibss join\n\nCommit 13c40c5 (\"mac80211: Add HT operation modes for IBSS\") broke\nibss operation by mistakenly removing the local-\u003eoper_channel\nupdate (causing ibss to start on the wrong channel). fix it.\n\nSigned-off-by: Eliad Peller \u003celiad@wizery.com\u003e\nAcked-by: Simon Wunderlich \u003csiwu@hrz.tu-chemnitz.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "875ad3f8e7dff6bc1d053e5bfe73d8e8d2e6ae67", "tree": "dec3691908348b240f2176ce681a7e4aa75e5fde", "parents": [ "dcd6c92267155e70a94b3927bce681ce74b80d1f" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jan 23 12:49:36 2012 -0500" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Mon Jan 23 14:03:46 2012 -0800" }, "message": "SUNRPC: Fix machine creds in generic_create_cred and generic_match\n\n- generic_create_cred needs to copy the \u0027.principal\u0027 field.\n- generic_match needs to ignore the groups and match on the \u0027.principal\u0027\n field.\n\nThis fixes an Oops that was introduced by commit 68c9715 (SUNRPC:\nClean up the RPCSEC_GSS service ticket requests)\n\nReported-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nTested-by: J. Bruce Fields \u003cbfields@redhat.com\u003e\n" }, { "commit": "f80400a26a2e8bff541de12834a1134358bb6642", "tree": "d88f2bda3e213b576714bb781e274833ef50b9b5", "parents": [ "b1cc16b8e643096adb92bbcb76c6c4c564141c40" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Sun Jan 22 00:20:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 23:41:05 2012 -0500" }, "message": "ethtool: allow ETHTOOL_GSSET_INFO for users\n\nAllow ETHTOOL_GSSET_INFO ethtool ioctl() for unprivileged users.\nETHTOOL_GSTRINGS is already allowed, but is unusable without this one.\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nAcked-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1cc16b8e643096adb92bbcb76c6c4c564141c40", "tree": "c82c5be4c43ab5c82cf9fad022a4c77df30e90cc", "parents": [ "0e90b31f4ba77027a7c21cbfc66404df0851ca21" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 14:45:14 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:46 2012 -0500" }, "message": "bluetooth: hci: Fix type of \"enable_hs\" to bool.\n\nFixes:\n\nnet/bluetooth/hci_core.c: In function ‘__check_enable_hs’:\nnet/bluetooth/hci_core.c:2587:1: warning: return from incompatible pointer type [enabled by default]\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0e90b31f4ba77027a7c21cbfc66404df0851ca21", "tree": "10dc6c443e2f058869d3953a90e6d48fb53f83ae", "parents": [ "8cfd14ad1eb52e44cb1fe7b47a68126e45e04026" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Fri Jan 20 04:57:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:46 2012 -0500" }, "message": "net: introduce res_counter_charge_nofail() for socket allocations\n\nThere is a case in __sk_mem_schedule(), where an allocation\nis beyond the maximum, but yet we are allowed to proceed.\nIt happens under the following condition:\n\n\tsk-\u003esk_wmem_queued + size \u003e\u003d sk-\u003esk_sndbuf\n\nThe network code won\u0027t revert the allocation in this case,\nmeaning that at some point later it\u0027ll try to do it. Since\nthis is never communicated to the underlying res_counter\ncode, there is an inbalance in res_counter uncharge operation.\n\nI see two ways of fixing this:\n\n1) storing the information about those allocations somewhere\n in memcg, and then deducting from that first, before\n we start draining the res_counter,\n2) providing a slightly different allocation function for\n the res_counter, that matches the original behavior of\n the network code more closely.\n\nI decided to go for #2 here, believing it to be more elegant,\nsince #1 would require us to do basically that, but in a more\nobscure way.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCC: Tejun Heo \u003ctj@kernel.org\u003e\nCC: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCC: Laurent Chavey \u003cchavey@google.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8a622e71f58ec9f092fc99eacae0e6cf14f6e742", "tree": "d0a19d7ad6672eb38a14b9d2cedf5fab690d18f4", "parents": [ "df505eb804d5221c3164ebecd1286cb7fc7f49ba" ], "author": { "name": "shawnlu", "email": "shawn.lu@ericsson.com", "time": "Fri Jan 20 12:22:04 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:45 2012 -0500" }, "message": "tcp: md5: using remote adress for md5 lookup in rst packet\n\nmd5 key is added in socket through remote address.\nremote address should be used in finding md5 key when\nsending out reset packet.\n\nSigned-off-by: shawnlu \u003cshawn.lu@ericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bf0813bd282f6ded0a5efca3db238287f7a3dbe8", "tree": "7c2cf691a713abb91fa4e452a5d4dad82bb4810a", "parents": [ "974c12360dfe6ab01201fe9e708e7755c413f8b6" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Jan 19 15:40:06 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:44 2012 -0500" }, "message": "pktgen: Fix unsigned function that is returning negative vals\n\nEvery call to num_args() immediately checks the return value for\nless than zero, as it will return -EFAULT for a failed get_user()\ncall. So it makes no sense for the function to be declared as an\nunsigned long.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "974c12360dfe6ab01201fe9e708e7755c413f8b6", "tree": "8cdf87f44c8be550af2ec1530f8cb271fb1a2e1f", "parents": [ "d0249e44432aa0ffcf710b64449b8eaa3722547e" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Thu Jan 19 14:42:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:44 2012 -0500" }, "message": "tcp: detect loss above high_seq in recovery\n\nCorrectly implement a loss detection heuristic: New sequences (above\nhigh_seq) sent during the fast recovery are deemed lost when higher\nsequences are SACKed.\n\nCurrent code does not catch these losses, because tcp_mark_head_lost()\ndoes not check packets beyond high_seq. The fix is straight-forward by\nchecking packets until the highest sacked packet. In addition, all the\nFLAG_DATA_LOST logic are in-effective and redundant and can be removed.\n\nUpdate the loss heuristic comments. The algorithm above is documented\nas heuristic B, but it is redundant too because heuristic A already\ncovers B.\n\nNote that this change only marks some forward-retransmitted packets LOST.\nIt does NOT forbid TCP performing further CWR on new losses. A potential\nfollow-up patch under preparation is to perform another CWR on \"new\"\nlosses such as\n1) sequence above high_seq is lost (by resetting high_seq to snd_nxt)\n2) retransmission is lost.\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a42b4799c683723e8c464de4026af085b2ebd5fa", "tree": "303ebae69ea9f9db0a5bdf7020dc26c01af14afd", "parents": [ "803143fbda719106017309d551d082e4b4e7c8c3" ], "author": { "name": "Vijay Subramanian", "email": "subramanian.vijay@gmail.com", "time": "Thu Jan 19 10:20:59 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 22 15:08:44 2012 -0500" }, "message": "netem: Fix off-by-one bug in reordering\n\nWith netem reordering, a gap of N is supposed to reorder every Nth packet with\ngiven reorder probability. However, the code currently skips N packets and\nreorders every (N+1)th packet.\n\nSigned-off-by: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a45f0086a2dcf50db7e6a0bf5be933880f85127", "tree": "f67d6ddb68c276bcf34077e7442b0ca722144c75", "parents": [ "fc16dcd8c2e1e9bc91ed765957e1f2bbf334253e" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Wed Jan 18 17:47:59 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 20 14:17:26 2012 -0500" }, "message": "tcp: fix undo after RTO for CUBIC\n\nThis patch fixes CUBIC so that cwnd reductions made during RTOs can be\nundone (just as they already can be undone when using the default/Reno\nbehavior).\n\nWhen undoing cwnd reductions, BIC-derived congestion control modules\nwere restoring the cwnd from last_max_cwnd. There were two problems\nwith using last_max_cwnd to restore a cwnd during undo:\n\n(a) last_max_cwnd was set to 0 on state transitions into TCP_CA_Loss\n(by calling the module\u0027s reset() functions), so cwnd reductions from\nRTOs could not be undone.\n\n(b) when fast_covergence is enabled (which it is by default)\nlast_max_cwnd does not actually hold the value of snd_cwnd before the\nloss; instead, it holds a scaled-down version of snd_cwnd.\n\nThis patch makes the following changes:\n\n(1) upon undo, revert snd_cwnd to ca-\u003eloss_cwnd, which is already, as\nthe existing comment notes, the \"congestion window at last loss\"\n\n(2) stop forgetting ca-\u003eloss_cwnd on TCP_CA_Loss events\n\n(3) use ca-\u003elast_max_cwnd to check if we\u0027re in slow start\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Sangtae Ha \u003csangtae.ha@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fc16dcd8c2e1e9bc91ed765957e1f2bbf334253e", "tree": "c7174ce035611b3088e2da38003655cf26e8ce0b", "parents": [ "b67f231ded332461dd31123c4f659c4681223fb1" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Wed Jan 18 17:47:58 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 20 14:17:26 2012 -0500" }, "message": "tcp: fix undo after RTO for BIC\n\nThis patch fixes BIC so that cwnd reductions made during RTOs can be\nundone (just as they already can be undone when using the default/Reno\nbehavior).\n\nWhen undoing cwnd reductions, BIC-derived congestion control modules\nwere restoring the cwnd from last_max_cwnd. There were two problems\nwith using last_max_cwnd to restore a cwnd during undo:\n\n(a) last_max_cwnd was set to 0 on state transitions into TCP_CA_Loss\n(by calling the module\u0027s reset() functions), so cwnd reductions from\nRTOs could not be undone.\n\n(b) when fast_covergence is enabled (which it is by default)\nlast_max_cwnd does not actually hold the value of snd_cwnd before the\nloss; instead, it holds a scaled-down version of snd_cwnd.\n\nThis patch makes the following changes:\n\n(1) upon undo, revert snd_cwnd to ca-\u003eloss_cwnd, which is already, as\nthe existing comment notes, the \"congestion window at last loss\"\n\n(2) stop forgetting ca-\u003eloss_cwnd on TCP_CA_Loss events\n\n(3) use ca-\u003elast_max_cwnd to check if we\u0027re in slow start\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "013d97e9da1877f1334aa8ff3a19921ebbfe99b5", "tree": "ed05c2420ea75eb036507d556d46d713ebe3bd9a", "parents": [ "35d87e3325e91ec6bc446bf71f50eccc9a7b3b8f" ], "author": { "name": "Francesco Ruggeri", "email": "fruggeri@aristanetworks.com", "time": "Mon Jan 16 10:40:10 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 18 16:38:34 2012 -0500" }, "message": "net: race condition in ipv6 forwarding and disable_ipv6 parameters\n\nThere is a race condition in addrconf_sysctl_forward() and\naddrconf_sysctl_disable().\nThese functions change idev-\u003ecnf.forwarding (resp. idev-\u003ecnf.disable_ipv6)\nand then try to grab the rtnl lock before performing any actions.\nIf that fails they restore the original value and restart the syscall.\nThis creates race conditions if ipv6 code tries to access\nthese parameters, or if multiple instances try to do the same operation.\nAs an example of the former, if __ipv6_ifa_notify() finds a 0 in\nidev-\u003ecnf.forwarding when invoked by addrconf_ifdown() it may not free\nanycast addresses, ultimately resulting in the net_device not being freed.\nThis patch reads the user parameters into a temporary location and only\nwrites the actual parameters when the rtnl lock is acquired.\nTested in 2.6.38.8.\nSigned-off-by: Francesco Ruggeri \u003cfruggeri@aristanetworks.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1c659a4475ec2b2f4495e4773c417a9100cbd9de", "tree": "26c026d7377624b2fd56f1bb369b31a8b34d043e", "parents": [ "ccb19d263fd1c9e34948e2158c53eacbff369344", "4f3d09de38d234ce7ffba5ec5a7e6704f983d375" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 18 15:59:32 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 18 15:59:32 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "bc4934bc61d0a11fd62c5187ff83645628f8be8b", "tree": "e5c26315009133b19ae39469d9278d5e3f2a6919", "parents": [ "65e8b0ccb6cf176f8eddb1b05534be46580da9dd" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Jan 18 14:10:25 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 18 14:38:06 2012 -0500" }, "message": "mac80211: fix work removal on deauth request\n\nWhen deauth is requested while an auth or assoc\nwork item is in progress, we currently delete it\nwithout regard for any state it might need to\nclean up. Fix it by cleaning up for those items.\n\nIn the case Pontus found, the problem manifested\nitself as such:\n\nauthenticate with 00:23:69:aa:dd:7b (try 1)\nauthenticated\nfailed to insert Dummy STA entry for the AP (error -17)\ndeauthenticating from 00:23:69:aa:dd:7b by local choice (reason\u003d2)\n\nIt could also happen differently if the driver\nuses the tx_sync callback.\n\nWe can\u0027t just call the -\u003edone() method of the work\nitems because that will lock up due to the locking\nin cfg80211. This fix isn\u0027t very clean, but that\nseems acceptable since I have patches pending to\nremove this code completely.\n\nCc: stable@vger.kernel.org\nReported-by: Pontus Fuchs \u003cpontus.fuchs@gmail.com\u003e\nTested-by: Pontus Fuchs \u003cpontus.fuchs@gmail.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "65e8b0ccb6cf176f8eddb1b05534be46580da9dd", "tree": "873c06bd136f80dc2a57a06e086d6934c0daab9c", "parents": [ "f96b08a7e6f69c0f0a576554df3df5b1b519c479" ], "author": { "name": "Javier Cardona", "email": "javier@cozybit.com", "time": "Tue Jan 17 18:17:46 2012 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 18 14:38:06 2012 -0500" }, "message": "mac80211: Use the right headroom size for mesh mgmt frames\n\nUse local-\u003etx_headroom instad of local-\u003ehw.extra_tx_headroom.\nlocal-\u003etx_headroom is the max of hw.extra_tx_headroom required by the\ndriver and the headroom required by mac80211 for status reporting. On\ndrivers where hw.extra_tx_headroom is smaller than what mac80211\nrequires (e.g. ath5k), we would not reserve sufficient buffer space to\nreport tx status.\n\nAlso, don\u0027t reserve local-\u003etx_headroom + local-\u003ehw.extra_tx_headroom.\n\nReported-by: Simon Morgenthaler \u003cs.morgenthaler@students.unibe.ch\u003e\nReported-by: Kai Scharwies \u003ckai@scharwies.de\u003e\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9446f3efc53512e5ad9e0966539021a2a41fe5a0", "tree": "466bd353a814c0dbee80b3df69315d0072171fa7", "parents": [ "c3b5003b628d8e373262bee42c7260d6a799c73e" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jan 17 10:32:01 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 18 14:38:05 2012 -0500" }, "message": "mac80211: fix debugfs key-\u003estation symlink\n\nSince stations moved into a virtual interface\nsubdirectory, this link has been broken. Fix it.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ccb19d263fd1c9e34948e2158c53eacbff369344", "tree": "6683e55f183920dcbf3e1a5b749e7f9780c465b3", "parents": [ "6a488979f574cb4287880db2dbc8b13cee30c5be", "c3b5003b628d8e373262bee42c7260d6a799c73e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 17 22:26:41 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)\n tg3: Fix single-vector MSI-X code\n openvswitch: Fix multipart datapath dumps.\n ipv6: fix per device IP snmp counters\n inetpeer: initialize -\u003eredirect_genid in inet_getpeer()\n net: fix NULL-deref in WARN() in skb_gso_segment()\n net: WARN if skb_checksum_help() is called on skb requiring segmentation\n caif: Remove bad WARN_ON in caif_dev\n caif: Fix typo in Vendor/Product-ID for CAIF modems\n bnx2x: Disable AN KR work-around for BCM57810\n bnx2x: Remove AutoGrEEEn for BCM84833\n bnx2x: Remove 100Mb force speed for BCM84833\n bnx2x: Fix PFC setting on BCM57840\n bnx2x: Fix Super-Isolate mode for BCM84833\n net: fix some sparse errors\n net: kill duplicate included header\n net: sh-eth: Fix build error by the value which is not defined\n net: Use device model to get driver name in skb_gso_segment()\n bridge: BH already disabled in br_fdb_cleanup()\n net: move sock_update_memcg outside of CONFIG_INET\n mwl8k: Fixing Sparse ENDIAN CHECK warning\n ...\n" }, { "commit": "77676fdbd54f0c6fdb71d55d9758bebc69a00fc4", "tree": "388bd73334ae4716b8d82879166a1c2a5639f0f0", "parents": [ "766e9f1be128bcdc15aa7d07084d0d51e873b5ed" ], "author": { "name": "Ben Pfaff", "email": "blp@nicira.com", "time": "Tue Jan 17 13:33:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 23:56:19 2012 -0500" }, "message": "openvswitch: Fix multipart datapath dumps.\n\nThe logic to split up the list of datapaths into multiple Netlink messages\nwas simply wrong, causing the list to be terminated after the first part.\nOnly about the first 50 datapaths would be dumped. This fixes the\nproblem.\n\nReported-by: Paul Ingram \u003cpaul@nicira.com\u003e\nSigned-off-by: Ben Pfaff \u003cblp@nicira.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "766e9f1be128bcdc15aa7d07084d0d51e873b5ed", "tree": "4b6098567a7f522792333d4bf30dc5676a507b9c", "parents": [ "10ec1bb7e9eb462548f14dd53c73e927a3ddf31c" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jan 17 12:45:36 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 23:56:18 2012 -0500" }, "message": "ipv6: fix per device IP snmp counters\n\nIn commit 4ce3c183fca (snmp: 64bit ipstats_mib for all arches), I forgot\nto change the /proc/net/dev_snmp6/xxx output for IP counters.\n\npercpu array is 64bit per counter but the folding still used the \u0027long\u0027\nvariant, and output garbage on 32bit arches.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10ec1bb7e9eb462548f14dd53c73e927a3ddf31c", "tree": "dbdd695c7879a4c8039b38f123ea7846964399d5", "parents": [ "65e9d2faab70d07b9a38ac6ed298f191d24541fc" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Tue Jan 17 10:48:43 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 15:52:12 2012 -0500" }, "message": "inetpeer: initialize -\u003eredirect_genid in inet_getpeer()\n\nkmemcheck complains that -\u003eredirect_genid doesn\u0027t get initialized.\nPresumably it should be set to zero.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "65e9d2faab70d07b9a38ac6ed298f191d24541fc", "tree": "41bb55a55858d79f142cb37c2f3c3364fc778790", "parents": [ "36c92474498ad6cc3afb24b91a67a444d79978fe" ], "author": { "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl", "time": "Tue Jan 17 10:00:40 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 15:51:23 2012 -0500" }, "message": "net: fix NULL-deref in WARN() in skb_gso_segment()\n\nBug was introduced in commit c8f44affb7244f2ac3e703cab13d55ede27621bb.\n\nSigned-off-by: Michał Mirosław \u003cmirq-linux@rere.qmqm.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "36c92474498ad6cc3afb24b91a67a444d79978fe", "tree": "6e847f5256b6ef429ca1a8ea85ede022d0c53cbe", "parents": [ "4144cb2ade46d97b9c41682fd2e9064a59f23a98" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jan 17 07:57:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 15:49:03 2012 -0500" }, "message": "net: WARN if skb_checksum_help() is called on skb requiring segmentation\n\nskb_checksum_help() has never done anything useful with skbs that\nrequire segmentation. Setting skb-\u003eip_summed \u003d CHECKSUM_NONE makes\nthem invalid and provokes a later WARNing in skb_gso_segment().\n\nPassing such an skb to skb_checksum_help() indicates a bug, so we\nshould warn about it immediately. Move the warning from\nskb_gso_segment() into a shared function, and add gso_type and\ngso_size to it.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4144cb2ade46d97b9c41682fd2e9064a59f23a98", "tree": "4b5ef937b4d0dcede6b1669f03c3b6dccf57d5bc", "parents": [ "59f608d84f937cb5e2fd3a0b9f848f200d47ba85", "604c4ef1c453a1b2ea2cdf04d2b49afec421ebfa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 12:11:52 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 12:11:52 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "59f608d84f937cb5e2fd3a0b9f848f200d47ba85", "tree": "1f2e58895a410e494c910176f401cea24dabff7d", "parents": [ "3371bb3f7ed11b7b7473a202e2713bde50dc01c0" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Tue Jan 17 03:03:14 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:46:55 2012 -0500" }, "message": "caif: Remove bad WARN_ON in caif_dev\n\nRemove WARN_ON and bad handling of SKB without destructor callback\nin caif_flow_cb. SKB without destructor cannot be handled as an\nerror case.\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3371bb3f7ed11b7b7473a202e2713bde50dc01c0", "tree": "2ce6211c2fb744f51ab249f6a9802775709075f3", "parents": [ "6ab48a5c86ce778188c173818cb2f1644526e962" ], "author": { "name": "sjur.brandeland@stericsson.com", "email": "sjur.brandeland@stericsson.com", "time": "Tue Jan 17 03:03:13 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:46:55 2012 -0500" }, "message": "caif: Fix typo in Vendor/Product-ID for CAIF modems\n\nFix typo for the Vendor/Product Id for ST-Ericsson CAIF modems.\nDiscovery is based on fixed USB vendor 0x04cc (ST-Ericsson),\nproduct-id 0x230f (NCM).\n\nSigned-off-by: Sjur Brændeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "747465ef7a082033e086dedc8189febfda43b015", "tree": "efbdc7a1f25f7bced035077769b4005ea1419abc", "parents": [ "2b2d465631db59c144f537a9bef47a883c55d670" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jan 16 19:27:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:31:12 2012 -0500" }, "message": "net: fix some sparse errors\n\nmake C\u003d2 CF\u003d\"-D__CHECK_ENDIAN__\" M\u003dnet\n\nAnd fix flowi4_init_output() prototype for sport\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2b2d465631db59c144f537a9bef47a883c55d670", "tree": "559e06d89bd37fb31006806c7d128171f7122e9c", "parents": [ "34aa6f1400810890636ba0b170effbfa71eacec7" ], "author": { "name": "Shan Wei", "email": "davidshan@tencent.com", "time": "Mon Jan 16 18:34:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:31:12 2012 -0500" }, "message": "net: kill duplicate included header\n\nFor net part, remove duplicate included header.\n\nSigned-off-by: Shan Wei \u003cdavidshan@tencent.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e52ac3398c3d772d372b9b62ab408fd5eec96840", "tree": "1291fbc00c9fec755be01f49be865219d676b540", "parents": [ "27a429383b399fc0f68bea55c422d7179f3c8b05" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jan 16 12:38:59 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:31:12 2012 -0500" }, "message": "net: Use device model to get driver name in skb_gso_segment()\n\nethtool operations generally require the caller to hold RTNL and are\nnot safe to call in atomic context. The device model provides this\ninformation for most devices; we\u0027ll only lose it for some old ISA\ndrivers.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nAcked-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "27a429383b399fc0f68bea55c422d7179f3c8b05", "tree": "a38d2d38a7506e10cf4bd00a2b49273d82878fbf", "parents": [ "319d3b9c97b5e3191e419bb95496bf08ec50f096" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jan 16 04:35:50 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:17:32 2012 -0500" }, "message": "bridge: BH already disabled in br_fdb_cleanup()\n\nbr_fdb_cleanup() is run from timer interrupt, BH already masked.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Štefan Gula \u003csteweg@gmail.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "544204733a20200951c271f81c74930ba5424638", "tree": "02fc04707eb974cf28bcac4e2fa0583dc4bfdd39", "parents": [ "d981e05908f85beb68ae0d935e59c5e399d2136e" ], "author": { "name": "Helmut Schaa", "email": "helmut.schaa@googlemail.com", "time": "Tue Jan 17 09:22:49 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 17 10:12:27 2012 -0500" }, "message": "mac80211: Fix possible race between sta_unblock and network softirq\n\nAll other code paths in sta_unblock synchronize with the network\nsoftirq by using local_bh_disable/enable. Do the same around\nieee80211_sta_ps_deliver_wakeup.\n\nSigned-off-by: Helmut Schaa \u003chelmut.schaa@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8d9d399f14ea65aeb50c7404e986bceede93bb99", "tree": "a55ce2e68562013b9d68fc4aa3e80c597308b7e7", "parents": [ "795d9a2538b205d9329f34798ec96503a07b7919" ], "author": { "name": "Devendra Naga", "email": "devendra.aaru@gmail.com", "time": "Sat Jan 14 08:16:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:07:58 2012 -0500" }, "message": "net: remove version.h includes in net/openvswitch/\n\nremove version.h includes in net/openswitch/ as reported by make versioncheck.\n\nSigned-off-by: Devendra Naga \u003cdevendra.aaru@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "795d9a2538b205d9329f34798ec96503a07b7919", "tree": "f6333348915e8b10b5f97734599cd090a1d520d4", "parents": [ "1886e5d2c694e7fb59434c717e704e7fd8475d2e" ], "author": { "name": "Hiroaki SHIMODA", "email": "shimoda.hiroaki@gmail.com", "time": "Sat Jan 14 07:10:21 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 17 10:05:55 2012 -0500" }, "message": "bql: Fix inconsistency between file mode and attr method.\n\nThere is no store() method for inflight attribute in the\ntx-\u003cn\u003e/byte_queue_limits sysfs directory.\nSo remove S_IWUSR bit.\n\nSigned-off-by: Hiroaki SHIMODA \u003cshimoda.hiroaki@gmail.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "be94db9ddac0d6ea76f479b04fb3a43314654c9f", "tree": "47bcb86c44bec1819a8581e88745b2812f2487b3", "parents": [ "088067f4f14d6ee5c6a196b015a560cbe7744224" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Sat Jan 14 16:42:13 2012 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Jan 17 10:52:55 2012 +0100" }, "message": "netfilter: ipset: dumping error triggered removing references twice\n\nIf there was a dumping error in the middle, the set-specific variable was\nnot zeroed out and thus the \u0027done\u0027 function of the dumping wrongly tried\nto release the already released reference of the set. The already released\nreference was caught by __ip_set_put and triggered a kernel BUG message.\nReported by Jean-Philippe Menil.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "088067f4f14d6ee5c6a196b015a560cbe7744224", "tree": "1be34b941c1671b70834212d2188f8ce6b1c1f45", "parents": [ "9bf04646b0b41c5438ed8a27c5f8dbe0ff40d756" ], "author": { "name": "Jozsef Kadlecsik", "email": "kadlec@blackhole.kfki.hu", "time": "Tue Jan 17 10:39:05 2012 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Jan 17 10:52:46 2012 +0100" }, "message": "netfilter: ipset: autoload set type modules safely\n\nJan Engelhardt noticed when userspace requests a set type unknown\nto the kernel, it can lead to a loop due to the unsafe type module\nloading. The issue is fixed in this patch.\n\nSigned-off-by: Jozsef Kadlecsik \u003ckadlec@blackhole.kfki.hu\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "d32a102819eef99d4d87019266bea208447be0a0", "tree": "ff6484ac0f843dc48c24db2604bfbef1424967e0", "parents": [ "331d9301ed4d0fe33e9762c62f2870243bcf77eb" ], "author": { "name": "Yoni Divinsky", "email": "yoni.divinsky@ti.com", "time": "Mon Jan 16 15:18:59 2012 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 16 15:01:16 2012 -0500" }, "message": "mac80211: fix tx-\u003eskb NULL pointer dereference\n\nIn function ieee80211_tx_h_encrypt the var info was\ninitialized from tx-\u003eskb, since the fucntion\nis called after the function ieee80211_tx_h_fragment\ntx-\u003eskb is not valid anymore.\n\nSigned-off-by: Yoni Divinsky \u003cyoni.divinsky@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "74b8cc3d592e5e884123eb99960a9f064223eaab", "tree": "293597e27723e538e60d5fa734de152070b9e136", "parents": [ "7a532fe7131216a02c81a6c1b1f8632da1195a58" ], "author": { "name": "Jesper Juhl", "email": "jj@chaosbits.net", "time": "Sat Jan 14 21:52:17 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 16 15:01:15 2012 -0500" }, "message": "Net, mac80211: Fix resource leak in ieee80211_rx_h_mesh_fwding()\n\nWe may leak the \u0027fwd_skb\u0027 we skb_copy() in ieee80211_rx_h_mesh_fwding() if\nwe take the \u0027else\u0027 branch in the \u0027if\u0027 statement just below. If we take\nthat branch we\u0027ll end up returning from the function and since we\u0027ve not\nassigned \u0027fwd_skb\u0027 to anything at that point, we leak it when the variable\ngoes out of scope.\n\nThe simple fix seems to be to just kfree_skb(fwd_skb); just before we\nreturn. That is what this patch does.\n\nSigned-off-by: Jesper Juhl \u003cjj@chaosbits.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "9bf04646b0b41c5438ed8a27c5f8dbe0ff40d756", "tree": "d06b83275667828112fc8e3d8ec9a6696a9f523c", "parents": [ "412662d204eca981458156fd64d9d5f3b533d7b6" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun Jan 15 16:57:12 2012 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Jan 16 14:01:23 2012 +0100" }, "message": "netfilter: revert user-space expectation helper support\n\nThis patch partially reverts:\n3d058d7 netfilter: rework user-space expectation helper support\nthat was applied during the 3.2 development cycle.\n\nAfter this patch, the tree remains just like before patch bc01bef,\nthat initially added the preliminary infrastructure.\n\nI decided to partially revert this patch because the approach\nthat I proposed to resolve this problem is broken in NAT setups.\nMoreover, a new infrastructure will be submitted for the 3.3.x\ndevelopment cycle that resolve the existing issues while\nproviding a neat solution.\n\nSince nobody has been seriously using this infrastructure in\nuser-space, the removal of this feature should affect any know\nFOSS project (to my knowledge).\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "412662d204eca981458156fd64d9d5f3b533d7b6", "tree": "a05bc418b5d943ba4c8d33cc3d8fe24c11d0a67d", "parents": [ "7c7c7f01cc5e3e423120a4848a73dd5e4586f2f9" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Wed Jan 11 11:52:17 2012 +1100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Jan 16 13:40:54 2012 +0100" }, "message": "netfilter: xt_hashlimit: fix unused variable warning if IPv6 disabled\n\nFixes this warning when CONFIG_IP6_NF_IPTABLES is not enabled:\n\nnet/netfilter/xt_hashlimit.c: In function ‘hashlimit_init_dst’:\nnet/netfilter/xt_hashlimit.c:448:9: warning: unused variable ‘frag_off’ [-Wunused-variable]\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "c49c41a4134679cecb77362e7f6b59acb6320aa7", "tree": "45e690c036ca5846a48c8be67945d1d841b2d96d", "parents": [ "892d208bcf79e4e1058707786a7b6d486697cd78", "f423e5ba76e7e4a6fcb4836b4f072d1fdebba8b5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:36:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 18:36:33 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security\n\n* \u0027for-linus\u0027 of git://selinuxproject.org/~jmorris/linux-security:\n capabilities: remove __cap_full_set definition\n security: remove the security_netlink_recv hook as it is equivalent to capable()\n ptrace: do not audit capability check when outputing /proc/pid/stat\n capabilities: remove task_ns_* functions\n capabitlies: ns_capable can use the cap helpers rather than lsm call\n capabilities: style only - move capable below ns_capable\n capabilites: introduce new has_ns_capabilities_noaudit\n capabilities: call has_ns_capability from has_capability\n capabilities: remove all _real_ interfaces\n capabilities: introduce security_capable_noaudit\n capabilities: reverse arguments to security_capable\n capabilities: remove the task from capable LSM hook entirely\n selinux: sparse fix: fix several warnings in the security server cod\n selinux: sparse fix: fix warnings in netlink code\n selinux: sparse fix: eliminate warnings for selinuxfs\n selinux: sparse fix: declare selinux_disable() in security.h\n selinux: sparse fix: move selinux_complete_init\n selinux: sparse fix: make selinux_secmark_refcount static\n SELinux: Fix RCU deref check warning in sel_netport_insert()\n\nManually fix up a semantic mis-merge wrt security_netlink_recv():\n\n - the interface was removed in commit fd7784615248 (\"security: remove\n the security_netlink_recv hook as it is equivalent to capable()\")\n\n - a new user of it appeared in commit a38f7907b926 (\"crypto: Add\n userspace configuration API\")\n\ncausing no automatic merge conflict, but Eric Paris pointed out the\nissue.\n" }, { "commit": "0b48d42235caf627121f440b57d376f48a9af8b6", "tree": "400967c5fcb1cd08bbc0e1739e229f9717590f19", "parents": [ "8e63dd6e1c589ba99a18df9cbaa41c3178607641", "7a6ef8c72314f254c107c6a9ed7cb201961ee05a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:26:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 14 12:26:41 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://linux-nfs.org/~bfields/linux\n\n* \u0027for-3.3\u0027 of git://linux-nfs.org/~bfields/linux: (31 commits)\n nfsd4: nfsd4_create_clid_dir return value is unused\n NFSD: Change name of extended attribute containing junction\n svcrpc: don\u0027t revert to SVC_POOL_DEFAULT on nfsd shutdown\n svcrpc: fix double-free on shutdown of nfsd after changing pool mode\n nfsd4: be forgiving in the absence of the recovery directory\n nfsd4: fix spurious 4.1 post-reboot failures\n NFSD: forget_delegations should use list_for_each_entry_safe\n NFSD: Only reinitilize the recall_lru list under the recall lock\n nfsd4: initialize special stateid\u0027s at compile time\n NFSd: use network-namespace-aware cache registering routines\n SUNRPC: create svc_xprt in proper network namespace\n svcrpc: update outdated BKL comment\n nfsd41: allow non-reclaim open-by-fh\u0027s in 4.1\n svcrpc: avoid memory-corruption on pool shutdown\n svcrpc: destroy server sockets all at once\n svcrpc: make svc_delete_xprt static\n nfsd: Fix oops when parsing a 0 length export\n nfsd4: Use kmemdup rather than duplicating its implementation\n nfsd4: add a separate (lockowner, inode) lookup\n nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error\n ...\n" }, { "commit": "543d1b92d5500841e70f15e79d197bbffed36561", "tree": "a41f7f9dced47e2f9fd967531107f57a7a59d1fd", "parents": [ "dfd00c4c8f3dfa1fd7cec45f83d98b2a49743dcd" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Jan 13 14:17:59 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 13 14:40:58 2012 -0500" }, "message": "mac80211: fix no-op authorized transitions\n\nWhen userspace attempts to authorize a station\nthat is already authorized, nothing happens as\nyou\u0027d expect. Similarly, when it unauthorizes\na station that is associated, nothing happens.\n\nHowever, when it unauthorizes a station that\nisn\u0027t even associated yet, we erroneously try\nto move the station to associated. This seems\nto happen occasionally as a result of a race\nwhen wpa_supplicant attempts to unauthorize\nthe port in managed mode. Particularly with my\nnew patches to keep stations, it can then move\na station into ASSOCIATED state before we have\nreally associated, which is really confusing.\n\nI introduced this bug in\n\"mac80211: refactor station state transitions\"\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "1a52bb0b686844021597d190e562ab55d1210104", "tree": "7edf13509869a6a7f1f488a679f15ff6c3057c54", "parents": [ "8638094e956a47dbb9a25166705a91e9a0981d52", "83eb26af0db71f2dfe551405c55d982288fa6178" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 10:29:21 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 13 10:29:21 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n ceph: ensure prealloc_blob is in place when removing xattr\n rbd: initialize snap_rwsem in rbd_add()\n ceph: enable/disable dentry complete flags via mount option\n vfs: export symbol d_find_any_alias()\n ceph: always initialize the dentry in open_root_dentry()\n libceph: remove useless return value for osd_client __send_request()\n ceph: avoid iput() while holding spinlock in ceph_dir_fsync\n ceph: avoid useless dget/dput in encode_fh\n ceph: dereference pointer after checking for NULL\n crush: fix force for non-root TAKE\n ceph: remove unnecessary d_fsdata conditional checks\n ceph: Use kmemdup rather than duplicating its implementation\n\nFix up conflicts in fs/ceph/super.c (d_alloc_root() failure handling vs\nalways initialize the dentry in open_root_dentry)\n" }, { "commit": "252c3d84ed398b090ac2dace46fc6faa6cfaea99", "tree": "afbeb033aa2857971aff3919c39f3c0b04c340f3", "parents": [ "099469502f62fbe0d7e4f0b83a2f22538367f734" ], "author": { "name": "RongQing.Li", "email": "roy.qing.li@gmail.com", "time": "Thu Jan 12 22:33:46 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 13 10:10:46 2012 -0800" }, "message": "ipv6: release idev when ip6_neigh_lookup failed in icmp6_dst_alloc\n\nrelease idev when ip6_neigh_lookup failed in icmp6_dst_alloc\n\nSigned-off-by: RongQing.Li \u003croy.qing.li@gmail.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7c17d86a8502c2e30c2eea777ed1b830aa3b447b", "tree": "353f739a33f46f9861b479e64d2a59f9b5c85868", "parents": [ "2485a4b610171f4e1c4ab0d053569747795c1bbe", "91dce7ddab99a29b600e3d792b847dc2cdbf0848" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:30:02 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 12 20:30:02 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (69 commits)\n pptp: Accept packet with seq zero\n RDS: Remove some unused iWARP code\n net: fsl: fec: handle 10Mbps speed in RMII mode\n drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c: add missing iounmap\n drivers/net/ethernet/tundra/tsi108_eth.c: add missing iounmap\n ksz884x: fix mtu for VLAN\n net_sched: sfq: add optional RED on top of SFQ\n dp83640: Fix NOHZ local_softirq_pending 08 warning\n gianfar: Fix invalid TX frames returned on error queue when time stamping\n gianfar: Fix missing sock reference when processing TX time stamps\n phylib: introduce mdiobus_alloc_size()\n net: decrement memcg jump label when limit, not usage, is changed\n net: reintroduce missing rcu_assign_pointer() calls\n inet_diag: Rename inet_diag_req_compat into inet_diag_req\n inet_diag: Rename inet_diag_req into inet_diag_req_v2\n bond_alb: don\u0027t disable softirq under bond_alb_xmit\n mac80211: fix rx-\u003ekey NULL pointer dereference in promiscuous mode\n nl80211: fix old station flags compatibility\n mdio-octeon: use an unique MDIO bus name.\n mdio-gpio: use an unique MDIO bus name.\n ...\n" }, { "commit": "5b7bf42e3d47fb16aaf53776ae3eaaf1be247a35", "tree": "ec0f971192337eda4ee0f483629572d69d883435", "parents": [ "8d82f219c2d476811cd3157a39c7b5c1f045ebc3" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Thu Jan 12 08:57:56 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 20:05:28 2012 -0800" }, "message": "RDS: Remove some unused iWARP code\n\nrds_iw_flush_goal() just returns a count, but it is only called in one\nplace and its return value is ignored there. So delete all the dead code.\n\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ddecf0f4db44ef94847a62d6ecf74456b4dcc66f", "tree": "48c49b70f83d713c7e3f594e067ee726bb70777e", "parents": [ "72092cc45378176ba700034c91b7af2db524df26" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Fri Jan 06 06:31:44 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 20:05:28 2012 -0800" }, "message": "net_sched: sfq: add optional RED on top of SFQ\n\nAdds an optional Random Early Detection on each SFQ flow queue.\n\nTraditional SFQ limits count of packets, while RED permits to also\ncontrol number of bytes per flow, and adds ECN capability as well.\n\n1) We dont handle the idle time management in this RED implementation,\nsince each \u0027new flow\u0027 begins with a null qavg. We really want to address\nbacklogged flows.\n\n2) if headdrop is selected, we try to ecn mark first packet instead of\ncurrently enqueued packet. This gives faster feedback for tcp flows\ncompared to traditional RED [ marking the last packet in queue ]\n\nExample of use :\n\ntc qdisc add dev $DEV parent 1:1 handle 10: est 1sec 4sec sfq \\\n\tlimit 3000 headdrop flows 512 divisor 16384 \\\n\tredflowlimit 100000 min 8000 max 60000 probability 0.20 ecn\n\nqdisc sfq 10: parent 1:1 limit 3000p quantum 1514b depth 127 headdrop\nflows 512/16384 divisor 16384\n ewma 6 min 8000b max 60000b probability 0.2 ecn\n prob_mark 0 prob_mark_head 4876 prob_drop 6131\n forced_mark 0 forced_mark_head 0 forced_drop 0\n Sent 1175211782 bytes 777537 pkt (dropped 6131, overlimits 11007\nrequeues 0)\n rate 99483Kbit 8219pps backlog 689392b 456p requeues 0\n\nIn this test, with 64 netperf TCP_STREAM sessions, 50% using ECN enabled\nflows, we can see number of packets CE marked is smaller than number of\ndrops (for non ECN flows)\n\nIf same test is run, without RED, we can check backlog is much bigger.\n\nqdisc sfq 10: parent 1:1 limit 3000p quantum 1514b depth 127 headdrop\nflows 512/16384 divisor 16384\n Sent 1148683617 bytes 795006 pkt (dropped 0, overlimits 0 requeues 0)\n rate 98429Kbit 8521pps backlog 1221290b 841p requeues 0\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Dave Taht \u003cdave.taht@gmail.com\u003e\nTested-by: Dave Taht \u003cdave.taht@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1398eee08222a038fa5f017900f387e81f6e3ff4", "tree": "0ac3e3645b2a71d4c67471ef0c072cfd87c6ff48", "parents": [ "cf778b00e96df6d64f8e21b8395d1f8a859ecdc7" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Thu Jan 12 02:16:06 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 12:27:59 2012 -0800" }, "message": "net: decrement memcg jump label when limit, not usage, is changed\n\nThe logic of the current code is that whenever we destroy\na cgroup that had its limit set (set meaning different than\nmaximum), we should decrement the jump_label counter.\nOtherwise we assume it was never incremented.\n\nBut what the code actually does is test for RES_USAGE\ninstead of RES_LIMIT. Usage being different than maximum\nis likely to be true most of the time.\n\nThe effect of this is that the key must become negative,\nand since the jump_label test says:\n\n !!atomic_read(\u0026key-\u003eenabled);\n\nwe\u0027ll have jump_labels still on when no one else is\nusing this functionality.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cf778b00e96df6d64f8e21b8395d1f8a859ecdc7", "tree": "4cc157d564bd65d687bdf722af3202e9e277ea98", "parents": [ "9ee6045f09a7875ebe55b9942b232a19076b157b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 12 04:41:32 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 12:26:56 2012 -0800" }, "message": "net: reintroduce missing rcu_assign_pointer() calls\n\ncommit a9b3cd7f32 (rcu: convert uses of rcu_assign_pointer(x, NULL) to\nRCU_INIT_POINTER) did a lot of incorrect changes, since it did a\ncomplete conversion of rcu_assign_pointer(x, y) to RCU_INIT_POINTER(x,\ny).\n\nWe miss needed barriers, even on x86, when y is not NULL.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9ee6045f09a7875ebe55b9942b232a19076b157b", "tree": "4c3924d35d99d413a95205ac21da8d369063234b", "parents": [ "3b09c84cb622ffbcdb5d541986b1eaf7d5812602", "1140afa862842ac3e56678693050760edc4ecde9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 12:10:00 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 12 12:10:00 2012 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "f96fde41f7f9af6cf20f6a1919f5d9670f84d574", "tree": "14b8a0343b255989ac8ba0ea34e18dca419723df", "parents": [ "5dfc17628d57f9e62043ed0cba03a6e3eb019a78" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:42 2012 +1030" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Thu Jan 12 15:44:42 2012 +1030" }, "message": "virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf\n\nRemove wrapper functions. This makes the allocation type explicit in\nall callers; I used GPF_KERNEL where it seemed obvious, left it at\nGFP_ATOMIC otherwise.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\n" }, { "commit": "3b09c84cb622ffbcdb5d541986b1eaf7d5812602", "tree": "5c322a4985f97c1360cf8877e8c70f8a0875dab0", "parents": [ "c8991362a0d3cf317dfbfb6cb946607870654e6d" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Jan 10 22:37:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 11 12:56:06 2012 -0800" }, "message": "inet_diag: Rename inet_diag_req_compat into inet_diag_req\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c8991362a0d3cf317dfbfb6cb946607870654e6d", "tree": "21db1072591e2549fedd6d54586efe3ef7f45cb4", "parents": [ "f515e6b77045b4b1f54617d9fbf4a22b95a58757" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Tue Jan 10 22:36:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 11 12:56:06 2012 -0800" }, "message": "inet_diag: Rename inet_diag_req into inet_diag_req_v2\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1140afa862842ac3e56678693050760edc4ecde9", "tree": "cd11d29f32ce0391b6565b37a1aa6dc8b319a42e", "parents": [ "bdd3ae3d1e749cf6597f035a5357f297a1af8eb3" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Wed Jan 11 09:26:54 2012 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 11 15:14:50 2012 -0500" }, "message": "mac80211: fix rx-\u003ekey NULL pointer dereference in promiscuous mode\n\nSince:\n\ncommit 816c04fe7ef01dd9649f5ccfe796474db8708be5\nAuthor: Christian Lamparter \u003cchunkeey@googlemail.com\u003e\nDate: Sat Apr 30 15:24:30 2011 +0200\n\n mac80211: consolidate MIC failure report handling\n\nis possible to that we dereference rx-\u003ekey \u003d\u003d NULL when driver set\nRX_FLAG_MMIC_STRIPPED and not RX_FLAG_IV_STRIPPED and we are in\npromiscuous mode. This happen with rt73usb and rt61pci at least.\n\nBefore the commit we always check rx-\u003ekey against NULL, so I assume\nfix should be done in mac80211 (also mic_fail path has similar check).\n\nReferences:\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d769766\nhttp://rt2x00.serialmonkey.com/pipermail/users_rt2x00.serialmonkey.com/2012-January/004395.html\n\nCc: stable@vger.kernel.org # 3.0+\nReported-by: Stuart D Gathman \u003cstuart@gathman.org\u003e\nReported-by: Kai Wohlfahrt \u003ckai.scorpio@gmail.com\u003e\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" } ], "next": "bdd3ae3d1e749cf6597f035a5357f297a1af8eb3" }