)]}' { "log": [ { "commit": "073219e995b4a3f8cf1ce8228b7ef440b6994ac0", "tree": "d140fc2e94bd8fd09270286b7267fb087a79f288", "parents": [ "3ed80a62bf959d34ebd4d553b026fbe7e6fbcc54" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Feb 08 10:36:58 2014 -0500" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Feb 08 10:36:58 2014 -0500" }, "message": "cgroup: clean up cgroup_subsys names and initialization\n\ncgroup_subsys is a bit messier than it needs to be.\n\n* The name of a subsys can be different from its internal identifier\n defined in cgroup_subsys.h. Most subsystems use the matching name\n but three - cpu, memory and perf_event - use different ones.\n\n* cgroup_subsys_id enums are postfixed with _subsys_id and each\n cgroup_subsys is postfixed with _subsys. cgroup.h is widely\n included throughout various subsystems, it doesn\u0027t and shouldn\u0027t\n have claim on such generic names which don\u0027t have any qualifier\n indicating that they belong to cgroup.\n\n* cgroup_subsys-\u003esubsys_id should always equal the matching\n cgroup_subsys_id enum; however, we require each controller to\n initialize it and then BUG if they don\u0027t match, which is a bit\n silly.\n\nThis patch cleans up cgroup_subsys names and initialization by doing\nthe followings.\n\n* cgroup_subsys_id enums are now postfixed with _cgrp_id, and each\n cgroup_subsys with _cgrp_subsys.\n\n* With the above, renaming subsys identifiers to match the userland\n visible names doesn\u0027t cause any naming conflicts. All non-matching\n identifiers are renamed to match the official names.\n\n cpu_cgroup -\u003e cpu\n mem_cgroup -\u003e memory\n perf -\u003e perf_event\n\n* controllers no longer need to initialize -\u003esubsys_id and -\u003ename.\n They\u0027re generated in cgroup core and set automatically during boot.\n\n* Redundant cgroup_subsys declarations removed.\n\n* While updating BUG_ON()s in cgroup_init_early(), convert them to\n WARN()s. BUGging that early during boot is stupid - the kernel\n can\u0027t print anything, even through serial console and the trap\n handler doesn\u0027t even link stack frame properly for back-tracing.\n\nThis patch doesn\u0027t introduce any behavior changes.\n\nv2: Rebased on top of fe1217c4f3f7 (\"net: net_cls: move cgroupfs\n classid handling into core\").\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nAcked-by: \"Rafael J. Wysocki\" \u003crjw@rjwysocki.net\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Aristeu Rozanski \u003caris@redhat.com\u003e\nAcked-by: Ingo Molnar \u003cmingo@redhat.com\u003e\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Serge E. Hallyn \u003cserue@us.ibm.com\u003e\nCc: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nCc: Thomas Graf \u003ctgraf@suug.ch\u003e\n" }, { "commit": "af6363374cbda5007e46efa99f7346efd4eea5fc", "tree": "413959c968a55bbe8f2592a82b9cc6e13308f508", "parents": [ "38dbfb59d1175ef458d006556061adeaa8751b72" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Feb 08 10:36:58 2014 -0500" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Feb 08 10:36:58 2014 -0500" }, "message": "cgroup: make CONFIG_CGROUP_NET_PRIO bool and drop unnecessary init_netclassid_cgroup()\n\nnet_prio is the only cgroup which is allowed to be built as a module.\nThe savings from allowing one controller to be built as a module are\ntiny especially given that cgroup module support itself adds quite a\nbit of complexity.\n\nGiven that none of other controllers has much chance of being made a\nmodule and that we\u0027re unlikely to add new modular controllers, the\nadded complexity is simply not justifiable.\n\nAs a first step to drop cgroup module support, this patch changes the\nconfig option to bool from tristate and drops module related code from\nit.\n\nAlso, while an earlier commit fe1217c4f3f7 (\"net: net_cls: move\ncgroupfs classid handling into core\") dropped module support from\nnet_cls cgroup, it retained a call to cgroup_load_subsys(), which is\nnoop for built-in controllers. Drop it along with\ninit_netclassid_cgroup().\n\nv2: Removed modular version of task_netprioidx() in\n include/net/netprio_cgroup.h as suggested by Li Zefan.\n\nv3: Rebased on top of fe1217c4f3f7 (\"net: net_cls: move cgroupfs\n classid handling into core\"). net_cls cgroup part is mostly\n dropped except for removal of init_netclassid_cgroup().\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\nCc: Thomas Graf \u003ctgraf@suug.ch\u003e\n" }, { "commit": "4ba9920e5e9c0e16b5ed24292d45322907bb9035", "tree": "7d023baea59ed0886ded1f0b6d1c6385690b88f7", "parents": [ "82c477669a4665eb4e52030792051e0559ee2a36", "8b662fe70c68282f78482dc272df0c4f355e49f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 25 11:17:34 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 25 11:17:34 2014 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking updates from David Miller:\n\n 1) BPF debugger and asm tool by Daniel Borkmann.\n\n 2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann.\n\n 3) Correct reciprocal_divide and update users, from Hannes Frederic\n Sowa and Daniel Borkmann.\n\n 4) Currently we only have a \"set\" operation for the hw timestamp socket\n ioctl, add a \"get\" operation to match. From Ben Hutchings.\n\n 5) Add better trace events for debugging driver datapath problems, also\n from Ben Hutchings.\n\n 6) Implement auto corking in TCP, from Eric Dumazet. Basically, if we\n have a small send and a previous packet is already in the qdisc or\n device queue, defer until TX completion or we get more data.\n\n 7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko.\n\n 8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel\n Borkmann.\n\n 9) Share IP header compression code between Bluetooth and IEEE802154\n layers, from Jukka Rissanen.\n\n10) Fix ipv6 router reachability probing, from Jiri Benc.\n\n11) Allow packets to be captured on macvtap devices, from Vlad Yasevich.\n\n12) Support tunneling in GRO layer, from Jerry Chu.\n\n13) Allow bonding to be configured fully using netlink, from Scott\n Feldman.\n\n14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can\n already get the TCI. From Atzm Watanabe.\n\n15) New \"Heavy Hitter\" qdisc, from Terry Lam.\n\n16) Significantly improve the IPSEC support in pktgen, from Fan Du.\n\n17) Allow ipv4 tunnels to cache routes, just like sockets. From Tom\n Herbert.\n\n18) Add Proportional Integral Enhanced packet scheduler, from Vijay\n Subramanian.\n\n19) Allow openvswitch to mmap\u0027d netlink, from Thomas Graf.\n\n20) Key TCP metrics blobs also by source address, not just destination\n address. From Christoph Paasch.\n\n21) Support 10G in generic phylib. From Andy Fleming.\n\n22) Try to short-circuit GRO flow compares using device provided RX\n hash, if provided. From Tom Herbert.\n\nThe wireless and netfilter folks have been busy little bees too.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits)\n net/cxgb4: Fix referencing freed adapter\n ipv6: reallocate addrconf router for ipv6 address when lo device up\n fib_frontend: fix possible NULL pointer dereference\n rtnetlink: remove IFLA_BOND_SLAVE definition\n rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info\n qlcnic: update version to 5.3.55\n qlcnic: Enhance logic to calculate msix vectors.\n qlcnic: Refactor interrupt coalescing code for all adapters.\n qlcnic: Update poll controller code path\n qlcnic: Interrupt code cleanup\n qlcnic: Enhance Tx timeout debugging.\n qlcnic: Use bool for rx_mac_learn.\n bonding: fix u64 division\n rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC\n sfc: Use the correct maximum TX DMA ring size for SFC9100\n Add Shradha Shah as the sfc driver maintainer.\n net/vxlan: Share RX skb de-marking and checksum checks with ovs\n tulip: cleanup by using ARRAY_SIZE()\n ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called\n net/cxgb4: Don\u0027t retrieve stats during recovery\n ...\n" }, { "commit": "6dd9158ae8577372aa433e6b0eae3c3d4caa5439", "tree": "aa097a9f9ea6206d668ac924460ad1a5d64e751c", "parents": [ "90804ed61f24712975fa12f8a1fc12cd46ef7d59", "f3411cb2b2e396a41ed3a439863f028db7140a34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 23 18:08:10 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 23 18:08:10 2014 -0800" }, "message": "Merge git://git.infradead.org/users/eparis/audit\n\nPull audit update from Eric Paris:\n \"Again we stayed pretty well contained inside the audit system.\n Venturing out was fixing a couple of function prototypes which were\n inconsistent (didn\u0027t hurt anything, but we used the same value as an\n int, uint, u32, and I think even a long in a couple of places).\n\n We also made a couple of minor changes to when a couple of LSMs called\n the audit system. We hoped to add aarch64 audit support this go\n round, but it wasn\u0027t ready.\n\n I\u0027m disappearing on vacation on Thursday. I should have internet\n access, but it\u0027ll be spotty. If anything goes wrong please be sure to\n cc rgb@redhat.com. He\u0027ll make fixing things his top priority\"\n\n* git://git.infradead.org/users/eparis/audit: (50 commits)\n audit: whitespace fix in kernel-parameters.txt\n audit: fix location of __net_initdata for audit_net_ops\n audit: remove pr_info for every network namespace\n audit: Modify a set of system calls in audit class definitions\n audit: Convert int limit uses to u32\n audit: Use more current logging style\n audit: Use hex_byte_pack_upper\n audit: correct a type mismatch in audit_syscall_exit()\n audit: reorder AUDIT_TTY_SET arguments\n audit: rework AUDIT_TTY_SET to only grab spin_lock once\n audit: remove needless switch in AUDIT_SET\n audit: use define\u0027s for audit version\n audit: documentation of audit\u003d kernel parameter\n audit: wait_for_auditd rework for readability\n audit: update MAINTAINERS\n audit: log task info on feature change\n audit: fix incorrect set of audit_sock\n audit: print error message when fail to create audit socket\n audit: fix dangling keywords in audit_log_set_loginuid() output\n audit: log on errors from filter user rules\n ...\n" }, { "commit": "ba7d49b1f0f8e5f24294a880ed576964059af5ef", "tree": "dbd5c9c4418d4a72fe44a5f9af0e51e0d2be747a", "parents": [ "df7dbcbbafc0b8f3fb31a40c6f3c4a7e15cb0b40" ], "author": { "name": "Jiri Pirko", "email": "jiri@resnulli.us", "time": "Wed Jan 22 09:05:55 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 22 21:57:05 2014 -0800" }, "message": "rtnetlink: provide api for getting and setting slave info\n\nRecent patch\nbonding: add netlink attributes to slave link dev (1d3ee88ae0d6)\n\nIntroduced yet another device specific way to access slave information\nover rtnetlink. There is one already there for bridge.\n\nThis patch introduces generic way to do this, for getting and setting\ninfo as well by extending link_ops. Later on, this new interface will\nbe used for bridge ports as well.\n\nSigned-off-by: Jiri Pirko \u003cjiri@resnulli.us\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7c90cc2d40cab15adc78545edba8b5996bd4cade", "tree": "64222b6892e1ffd29f91102cada60da71ea7a40f", "parents": [ "eb97768acb3f7749a3a03ee35fee9088244113ea" ], "author": { "name": "FX Le Bail", "email": "fx.lebail@yahoo.com", "time": "Wed Jan 22 07:42:37 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 22 21:57:05 2014 -0800" }, "message": "ipv6: enable anycast addresses as source addresses for datagrams\n\nThis change allows to consider an anycast address valid as source address\nwhen given via an IPV6_PKTINFO or IPV6_2292PKTINFO ancillary data item.\nSo, when sending a datagram with ancillary data, the unicast and anycast\naddresses are handled in the same way.\n\n- Adds ipv6_chk_acast_addr_src() to check if an anycast address is link-local\n on given interface or is global.\n- Uses it in ip6_datagram_send_ctl().\n\nSigned-off-by: Francois-Xavier Le Bail \u003cfx.lebail@yahoo.com\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "809fa972fd90ff27225294b17a027e908b2d7b7a", "tree": "3bb15ec5b897df4ea197339478bb5d76049a2761", "parents": [ "89770b0a69ee0e0e5e99c722192d535115f73778" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Wed Jan 22 02:29:41 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 23:17:20 2014 -0800" }, "message": "reciprocal_divide: update/correction of the algorithm\n\nJakub Zawadzki noticed that some divisions by reciprocal_divide()\nwere not correct [1][2], which he could also show with BPF code\nafter divisions are transformed into reciprocal_value() for runtime\ninvariance which can be passed to reciprocal_divide() later on;\nreverse in BPF dump ended up with a different, off-by-one K in\nsome situations.\n\nThis has been fixed by Eric Dumazet in commit aee636c4809fa5\n(\"bpf: do not use reciprocal divide\"). This follow-up patch\nimproves reciprocal_value() and reciprocal_divide() to work in\nall cases by using Granlund and Montgomery method, so that also\nfuture use is safe and without any non-obvious side-effects.\nKnown problems with the old implementation were that division by 1\nalways returned 0 and some off-by-ones when the dividend and divisor\nwhere very large. This seemed to not be problematic with its\ncurrent users, as far as we can tell. Eric Dumazet checked for\nthe slab usage, we cannot surely say so in the case of flex_array.\nStill, in order to fix that, we propose an extension from the\noriginal implementation from commit 6a2d7a955d8d resp. [3][4],\nby using the algorithm proposed in \"Division by Invariant Integers\nUsing Multiplication\" [5], Torbjörn Granlund and Peter L.\nMontgomery, that is, pseudocode for q \u003d n/d where q, n, d is in\nu32 universe:\n\n1) Initialization:\n\n int l \u003d ceil(log_2 d)\n uword m\u0027 \u003d floor((1\u003c\u003c32)*((1\u003c\u003cl)-d)/d)+1\n int sh_1 \u003d min(l,1)\n int sh_2 \u003d max(l-1,0)\n\n2) For q \u003d n/d, all uword:\n\n uword t \u003d (n*m\u0027)\u003e\u003e32\n q \u003d (t+((n-t)\u003e\u003esh_1))\u003e\u003esh_2\n\nThe assembler implementation from Agner Fog [6] also helped a lot\nwhile implementing. We have tested the implementation on x86_64,\nppc64, i686, s390x; on x86_64/haswell we\u0027re still half the latency\ncompared to normal divide.\n\nJoint work with Daniel Borkmann.\n\n [1] http://www.wireshark.org/~darkjames/reciprocal-buggy.c\n [2] http://www.wireshark.org/~darkjames/set-and-dump-filter-k-bug.c\n [3] https://gmplib.org/~tege/division-paper.pdf\n [4] http://homepage.cs.uiowa.edu/~jones/bcd/divide.html\n [5] http://citeseerx.ist.psu.edu/viewdoc/summary?doi\u003d10.1.1.1.2556\n [6] http://www.agner.org/optimize/asmlib.zip\n\nReported-by: Jakub Zawadzki \u003cdarkjames-ws@darkjames.pl\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Austin S Hemmelgarn \u003cahferroin7@gmail.com\u003e\nCc: linux-kernel@vger.kernel.org\nCc: Jesse Gross \u003cjesse@nicira.com\u003e\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Pekka Enberg \u003cpenberg@kernel.org\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Andy Gospodarek \u003candy@greyhouse.net\u003e\nCc: Veaceslav Falico \u003cvfalico@redhat.com\u003e\nCc: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nCc: Jakub Zawadzki \u003cdarkjames-ws@darkjames.pl\u003e\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "89770b0a69ee0e0e5e99c722192d535115f73778", "tree": "a8c96a91c2417dc81f5ce08aa59ebcfd456e0335", "parents": [ "f337db64af059c9a94278a8b0ab97d87259ff62f" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Wed Jan 22 02:29:40 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 23:17:20 2014 -0800" }, "message": "net: introduce reciprocal_scale helper and convert users\n\nAs David Laight suggests, we shouldn\u0027t necessarily call this\nreciprocal_divide() when users didn\u0027t requested a reciprocal_value();\nlets keep the basic idea and call it reciprocal_scale(). More\nbackground information on this topic can be found in [1].\n\nJoint work with Hannes Frederic Sowa.\n\n [1] http://homepage.cs.uiowa.edu/~jones/bcd/divide.html\n\nSuggested-by: David Laight \u003cdavid.laight@aculab.com\u003e\nCc: Jakub Zawadzki \u003cdarkjames-ws@darkjames.pl\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: linux-kernel@vger.kernel.org\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5bc1d1b4a261a865cbde65b1561748df5b9c724b", "tree": "4920c464aba555430904d4b93936a72a391016c7", "parents": [ "048ed4b6266144fdee55089c9eef55b0c1d42ba1" ], "author": { "name": "wangweidong", "email": "wangweidong1@huawei.com", "time": "Tue Jan 21 15:44:12 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 18:41:36 2014 -0800" }, "message": "sctp: remove macros sctp_bh_[un]lock_sock\n\nRedefined bh_[un]lock_sock to sctp_bh[un]lock_sock for user\nspace friendly code which we haven\u0027t use in years, so removing them.\n\nSigned-off-by: Wang Weidong \u003cwangweidong1@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "048ed4b6266144fdee55089c9eef55b0c1d42ba1", "tree": "bb02f9c12fc03990de37fb10683392fdf877a5bc", "parents": [ "1b0de194f11450d1c1e164bf2826fe80a38e1f62" ], "author": { "name": "wangweidong", "email": "wangweidong1@huawei.com", "time": "Tue Jan 21 15:44:11 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 18:41:36 2014 -0800" }, "message": "sctp: remove macros sctp_{lock|release}_sock\n\nRedefined {lock|release}_sock to sctp_{lock|release}_sock for user space friendly\ncode which we haven\u0027t use in years, so removing them.\n\nSigned-off-by: Wang Weidong \u003cwangweidong1@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1b0de194f11450d1c1e164bf2826fe80a38e1f62", "tree": "0a88902e64eae40ed8b74293d8d1ed31b2d32cd5", "parents": [ "387602dfdc3332f786f6195c74d53f9e8f7af402" ], "author": { "name": "wangweidong", "email": "wangweidong1@huawei.com", "time": "Tue Jan 21 15:44:10 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 18:40:41 2014 -0800" }, "message": "sctp: remove macros sctp_read_[un]lock\n\nRedefined read_[un]lock to sctp_read_[un]lock for user space\nfriendly code which we haven\u0027t use in years, and the macros\nwe never used, so removing them.\n\nSigned-off-by: Wang Weidong \u003cwangweidong1@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "387602dfdc3332f786f6195c74d53f9e8f7af402", "tree": "a1e21742e54dbb08202e64e61c7ddd6976333f00", "parents": [ "3c8e43ba9fe93b2670decc119f82f072a8d2459f" ], "author": { "name": "wangweidong", "email": "wangweidong1@huawei.com", "time": "Tue Jan 21 15:44:09 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 18:40:41 2014 -0800" }, "message": "sctp: remove macros sctp_write_[un]_lock\n\nRedefined write_[un]lock to sctp_write_[un]lock for user space\nfriendly code which we haven\u0027t use in years, so removing them.\n\nSigned-off-by: Wang Weidong \u003cwangweidong1@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c8e43ba9fe93b2670decc119f82f072a8d2459f", "tree": "187011eb548ea89b4d56d036030b8318a5566853", "parents": [ "79b91130a2679ea5063d49c021d97346a09eb0a5" ], "author": { "name": "wangweidong", "email": "wangweidong1@huawei.com", "time": "Tue Jan 21 15:44:08 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 18:40:41 2014 -0800" }, "message": "sctp: remove macros sctp_spin_[un]lock\n\nRedefined spin_[un]lock to sctp_spin_[un]lock for user space friendly\ncode which we haven\u0027t use in years, so removing them.\n\nSigned-off-by: Wang Weidong \u003cwangweidong1@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "79b91130a2679ea5063d49c021d97346a09eb0a5", "tree": "c529035c6a148ea9c407326f0ba5d29b9ab69e7d", "parents": [ "940287ee10e270b78fbda6c44eaa1def5fde897d" ], "author": { "name": "wangweidong", "email": "wangweidong1@huawei.com", "time": "Tue Jan 21 15:44:07 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 18:40:40 2014 -0800" }, "message": "sctp: remove macros sctp_local_bh_{disable|enable}\n\nRedefined local_bh_{disable|enable} to sctp_local_bh_{disable|enable}\nfor user space friendly code which we haven\u0027t use in years, so removing them.\n\nSigned-off-by: Wang Weidong \u003cwangweidong1@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "940287ee10e270b78fbda6c44eaa1def5fde897d", "tree": "b171d0c490547693d693d1af677d8e39912ea848", "parents": [ "d08f161a10006491d5835702bff2a12c91fb0cdd" ], "author": { "name": "wangweidong", "email": "wangweidong1@huawei.com", "time": "Tue Jan 21 15:44:06 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 18:40:40 2014 -0800" }, "message": "sctp: remove macros sctp_spin_[un]lock_irqrestore\n\nRedefined spin_[un]lock_irqstore to sctp_spin_[un]lock_irqrestore for user\nspace friendly code which we haven\u0027t use in years, so removing them.\n\nSigned-off-by: Wang Weidong \u003cwangweidong1@huawei.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dc01e7d3447793fd9e4090aa9d50c549848b5a18", "tree": "78986427fd32829b74d9947612eb2e12913cc768", "parents": [ "e27a2f839598e48bb345f9fc86d4d54c3944db50" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Mon Jan 20 13:59:21 2014 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 18:05:04 2014 -0800" }, "message": "net: Add GRO support for vxlan traffic\n\nAdd GRO handlers for vxlann, by using the UDP GRO infrastructure.\n\nFor single TCP session that goes through vxlan tunneling I got nice\nimprovement from 6.8Gbs to 11.5Gbs\n\n--\u003e UDP/VXLAN GRO disabled\n$ netperf -H 192.168.52.147 -c -C\n\n$ netperf -t TCP_STREAM -H 192.168.52.147 -c -C\nMIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 192.168.52.147 () port 0 AF_INET\nRecv Send Send Utilization Service Demand\nSocket Socket Message Elapsed Send Recv Send Recv\nSize Size Size Time Throughput local remote local remote\nbytes bytes bytes secs. 10^6bits/s % S % S us/KB us/KB\n\n 87380 65536 65536 10.00 6799.75 12.54 24.79 0.604 1.195\n\n--\u003e UDP/VXLAN GRO enabled\n\n$ netperf -t TCP_STREAM -H 192.168.52.147 -c -C\nMIGRATED TCP STREAM TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to 192.168.52.147 () port 0 AF_INET\nRecv Send Send Utilization Service Demand\nSocket Socket Message Elapsed Send Recv Send Recv\nSize Size Size Time Throughput local remote local remote\nbytes bytes bytes secs. 10^6bits/s % S % S us/KB us/KB\n\n 87380 65536 65536 10.00 11562.72 24.90 20.34 0.706 0.577\n\nSigned-off-by: Shlomo Pongratz \u003cshlomop@mellanox.com\u003e\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b582ef0990d457f7ce8ccf827af51a575ca0b4a6", "tree": "2893cba0f3c386795a7324c71851d165a68d891e", "parents": [ "2618abb73c8953f0848511fc13f68da4d8337574" ], "author": { "name": "Or Gerlitz", "email": "ogerlitz@mellanox.com", "time": "Mon Jan 20 13:59:19 2014 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 18:05:04 2014 -0800" }, "message": "net: Add GRO support for UDP encapsulating protocols\n\nAdd GRO handlers for protocols that do UDP encapsulation, with the intent of\nbeing able to coalesce packets which encapsulate packets belonging to\nthe same TCP session.\n\nFor GRO purposes, the destination UDP port takes the role of the ether type\nfield in the ethernet header or the next protocol in the IP header.\n\nThe UDP GRO handler will only attempt to coalesce packets whose destination\nport is registered to have gro handler.\n\nUse a mark on the skb GRO CB data to disallow (flush) running the udp gro receive\ncode twice on a packet. This solves the problem of udp encapsulated packets whose\ninner VM packet is udp and happen to carry a port which has registered offloads.\n\nSigned-off-by: Shlomo Pongratz \u003cshlomop@mellanox.com\u003e\nSigned-off-by: Or Gerlitz \u003cogerlitz@mellanox.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "82b276cd2b0bacd58e7c307bf8856925a68c4d14", "tree": "ffc8648efa91f83f81c94ac83447dc5246a835cf", "parents": [ "446fab59333dea91e54688f033dd8d788d0486fb" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Mon Jan 20 05:16:39 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 16:59:19 2014 -0800" }, "message": "ipv6: protect protocols not handling ipv4 from v4 connection/bind attempts\n\nSome ipv6 protocols cannot handle ipv4 addresses, so we must not allow\nconnecting and binding to them. sendmsg logic does already check msg-\u003ename\nfor this but must trust already connected sockets which could be set up\nfor connection to ipv4 address family.\n\nPer-socket flag ipv6only is of no use here, as it is under users control\nby setsockopt.\n\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6e6a50c254220acb19bd338ce433b1770e4a7a3c", "tree": "840f89c1091bf67f2756553e74df65dafa1233c9", "parents": [ "c779f7af99f73abb7270dcaa4c29178ab5ef7472" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Fri Jan 17 11:37:03 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 14:43:16 2014 -0800" }, "message": "net_sched: act: export tcf_hash_search() instead of tcf_hash_lookup()\n\nSo that we will not expose struct tcf_common to modules.\n\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c779f7af99f73abb7270dcaa4c29178ab5ef7472", "tree": "166e92b6b61aa2259c91e96fac1683ffe2fb8c13", "parents": [ "75e4364f67d9cb996f9a6ff982ad9b3700648591" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Fri Jan 17 11:37:02 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 21 14:43:16 2014 -0800" }, "message": "net_sched: act: fetch hinfo from a-\u003eops-\u003ehinfo\n\nEvery action ops has a pointer to hash info, so we don\u0027t need to\nhard-code it in each module.\n\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a0fa1dd3cdbccec9597fe53b6177a9aa6e20f2f8", "tree": "b249854573815eedf377e554f0ea516f86411841", "parents": [ "9326657abe1a83ed4b4f396b923ca1217fd50cba", "eaad45132c564ce377e6dce05e78e08e456d5315" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 20 10:42:08 2014 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 20 10:42:08 2014 -0800" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler changes from Ingo Molnar:\n\n - Add the initial implementation of SCHED_DEADLINE support: a real-time\n scheduling policy where tasks that meet their deadlines and\n periodically execute their instances in less than their runtime quota\n see real-time scheduling and won\u0027t miss any of their deadlines.\n Tasks that go over their quota get delayed (Available to privileged\n users for now)\n\n - Clean up and fix preempt_enable_no_resched() abuse all around the\n tree\n\n - Do sched_clock() performance optimizations on x86 and elsewhere\n\n - Fix and improve auto-NUMA balancing\n\n - Fix and clean up the idle loop\n\n - Apply various cleanups and fixes\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (60 commits)\n sched: Fix __sched_setscheduler() nice test\n sched: Move SCHED_RESET_ON_FORK into attr::sched_flags\n sched: Fix up attr::sched_priority warning\n sched: Fix up scheduler syscall LTP fails\n sched: Preserve the nice level over sched_setscheduler() and sched_setparam() calls\n sched/core: Fix htmldocs warnings\n sched/deadline: No need to check p if dl_se is valid\n sched/deadline: Remove unused variables\n sched/deadline: Fix sparse static warnings\n m68k: Fix build warning in mac_via.h\n sched, thermal: Clean up preempt_enable_no_resched() abuse\n sched, net: Fixup busy_loop_us_clock()\n sched, net: Clean up preempt_enable_no_resched() abuse\n sched/preempt: Fix up missed PREEMPT_NEED_RESCHED folding\n sched/preempt, locking: Rework local_bh_{dis,en}able()\n sched/clock, x86: Avoid a runtime condition in native_sched_clock()\n sched/clock: Fix up clear_sched_clock_stable()\n sched/clock, x86: Use a static_key for sched_clock_stable\n sched/clock: Remove local_irq_disable() from the clocks\n sched/clock, x86: Rewrite cyc2ns() to avoid the need to disable IRQs\n ...\n" }, { "commit": "671314a5abb7abb8346cd3f16f75c1e55ed7667b", "tree": "7f684415739016dc45149e2b6f5bd8e2e1ed4689", "parents": [ "9d08dd3d320fab4e8b491eb34ebbb5476d2266cf" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Wed Jan 15 15:49:30 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 19 19:58:07 2014 -0800" }, "message": "net_sched: act: remove capab from struct tc_action_ops\n\nIt is not actually implemented.\n\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4b261c75a99f29c93a0b6babfc180cdf566bd654", "tree": "2c1fcebd79d2fcb1625f89ef5067605151953010", "parents": [ "a6e2fe17eba47681e82cdb9cfed5a67b57802a78" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Mon Jan 20 03:43:08 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 19 19:53:18 2014 -0800" }, "message": "ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams\n\nWe currently don\u0027t report IPV6_RECVPKTINFO in cmsg access ancillary data\nfor IPv4 datagrams on IPv6 sockets.\n\nThis patch splits the ip6_datagram_recv_ctl into two functions, one\nwhich handles both protocol families, AF_INET and AF_INET6, while the\nip6_datagram_recv_specific_ctl only handles IPv6 cmsg data.\n\nip6_datagram_recv_*_ctl never reported back any errors, so we can make\nthem return void. Also provide a helper for protocols which don\u0027t offer dual\npersonality to further use ip6_datagram_recv_ctl, which is exported to\nmodules.\n\nI needed to shuffle the code for ping around a bit to make it easier to\nimplement dual personality for ping ipv6 sockets in future.\n\nReported-by: Gert Doering \u003cgert@space.net\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6444f72b4b74f627c51891101e93ba2b94078b0a", "tree": "d5aa20605d13fa3e222e7e1bf1b7b678a295f398", "parents": [ "46e5f401762c639e38eea350d335c0f54ec2442f" ], "author": { "name": "Florent Fourcot", "email": "florent.fourcot@enst-bretagne.fr", "time": "Fri Jan 17 17:15:05 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 19 17:12:31 2014 -0800" }, "message": "ipv6: add flowlabel_consistency sysctl\n\nWith the introduction of IPV6_FL_F_REFLECT, there is no guarantee of\nflow label unicity. This patch introduces a new sysctl to protect the old\nbehaviour, enable by default.\n\nChangelog of V3:\n * rename ip6_flowlabel_consistency to flowlabel_consistency\n * use net_info_ratelimited()\n * checkpatch cleanups\n\nSigned-off-by: Florent Fourcot \u003cflorent.fourcot@enst-bretagne.fr\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "46e5f401762c639e38eea350d335c0f54ec2442f", "tree": "76f12d6f2425d05a13f09e27cd66c981b29312f4", "parents": [ "df3687ffc6653e4d32168338b4dee20c164ed7c9" ], "author": { "name": "Florent Fourcot", "email": "florent.fourcot@enst-bretagne.fr", "time": "Fri Jan 17 17:15:04 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 19 17:12:31 2014 -0800" }, "message": "ipv6: add a flag to get the flow label used remotly\n\nThis information is already available via IPV6_FLOWINFO\nof IPV6_2292PKTOPTIONS, and them a filtering to get the flow label\ninformation. But it is probably logical and easier for users to add this\nhere, and to control both sent/received flow label values with the\nIPV6_FLOWLABEL_MGR option.\n\nSigned-off-by: Florent Fourcot \u003cflorent.fourcot@enst-bretagne.fr\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "41804420586ab41049a14ab7ef04eaa2280b8647", "tree": "f05b39b0c5f1ed229b073f7a993ef717f9f1a363", "parents": [ "7b1e46c5a265b142dd05ff3463fa3e0a1f4e4172", "7d0d46da750a252371cb747b48ddda27d1047881" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 18 00:55:41 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 18 00:55:41 2014 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c\n\tnet/ipv4/tcp_metrics.c\n\nOverlapping changes between the \"don\u0027t create two tcp metrics objects\nwith the same key\" race fix in net and the addition of the destination\naddress in the lookup key in net-next.\n\nMinor overlapping changes in bnx2x driver.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c7e7610ff6888ea15a901fbcb30c5d461816b34", "tree": "15e55648f844c0338783711c523008301486c637", "parents": [ "db893473d313a4ad9455e89d1bd5e136a57f411e" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Jan 16 16:41:19 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 17 18:36:39 2014 -0800" }, "message": "ipv4: fix a dst leak in tunnels\n\nThis patch :\n\n1) Remove a dst leak if DST_NOCACHE was set on dst\n Fix this by holding a reference only if dst really cached.\n\n2) Remove a lockdep warning in __tunnel_dst_set()\n This was reported by Cong Wang.\n\n3) Remove usage of a spinlock where xchg() is enough\n\n4) Remove some spurious inline keywords.\n Let compiler decide for us.\n\nFixes: 7d442fab0a67 (\"ipv4: Cache dst in tunnels\")\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Cong Wang \u003ccwang@twopensource.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nCc: Maciej Żenczykowski \u003cmaze@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "11ffff752c6a5adc86f7dd397b2f75af8f917c51", "tree": "857e74e69def8f491d7d3eca9ee84497122cd81f", "parents": [ "77f99ad16a07aa062c2d30fae57b1fee456f6ef6" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Thu Jan 16 20:13:04 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 17 18:10:01 2014 -0800" }, "message": "ipv6: simplify detection of first operational link-local address on interface\n\nIn commit 1ec047eb4751e3 (\"ipv6: introduce per-interface counter for\ndad-completed ipv6 addresses\") I build the detection of the first\noperational link-local address much to complex. Additionally this code\nnow has a race condition.\n\nReplace it with a much simpler variant, which just scans the address\nlist when duplicate address detection completes, to check if this is\nthe first valid link local address and send RS and MLD reports then.\n\nFixes: 1ec047eb4751e3 (\"ipv6: introduce per-interface counter for dad-completed ipv6 addresses\")\nReported-by: Jiri Pirko \u003cjiri@resnulli.us\u003e\nCc: Flavio Leitner \u003cfbl@redhat.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nAcked-by: Flavio Leitner \u003cfbl@redhat.com\u003e\nAcked-by: Jiri Pirko \u003cjiri@resnulli.us\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1d13a96c74fc4802a775189ddb58bc6469ffdaa3", "tree": "bf854b523585d551146a82d12d429ab19ae6ef3c", "parents": [ "d037c4d70fb281cd54efb03254b51c7452750491" ], "author": { "name": "Florent Fourcot", "email": "florent.fourcot@enst-bretagne.fr", "time": "Thu Jan 16 17:21:22 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 17 17:56:33 2014 -0800" }, "message": "ipv6: tcp: fix flowlabel value in ACK messages send from TIME_WAIT\n\nThis patch is following the commit b903d324bee262 (ipv6: tcp: fix TCLASS\nvalue in ACK messages sent from TIME_WAIT).\n\nFor the same reason than tclass, we have to store the flow label in the\ninet_timewait_sock to provide consistency of flow label on the last ACK.\n\nSigned-off-by: Florent Fourcot \u003cflorent.fourcot@enst-bretagne.fr\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7916a075571f0ccd0830cf3da293188a8b6045e3", "tree": "119c5bb9e513c8205efed485c2dc7b8271123326", "parents": [ "cf84eb0b09c0f09b4c70a648b9dfeec78be61f07", "e4e19c031901e95dc7d1cf0a2c9c50525d71651f" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 17 14:43:17 2014 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 17 14:43:17 2014 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "89740ca74f5bb45d3e0dcb4aa9eab0ba9864bff5", "tree": "378e227ef6c2bd2776afc4d6c29d89574fdee9c6", "parents": [ "d6e26404732ac5d82ee34e197c35241d581d1c4c" ], "author": { "name": "Jiri Pirko", "email": "jiri@resnulli.us", "time": "Thu Jan 09 14:13:47 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 16 11:31:58 2014 -0800" }, "message": "neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions.\n\nWhen ndo_neigh_setup is called, the bitfield used by NEIGH_VAR_SET is\nnot initialized yet. This might cause confusion for the people who use\nNEIGH_VAR_SET in ndo_neigh_setup. So rather introduce NEIGH_VAR_INIT for\nusage in ndo_neigh_setup.\n\nSigned-off-by: Jiri Pirko \u003cjiri@resnulli.us\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d76ed22b225c02228c643ae336f76e086fdc32f0", "tree": "e420a54624555e185458c2d8a443820ef9a276e5", "parents": [ "e96a41ebde3b66dbb59d3ffa0a38dff6e5ca25a9" ], "author": { "name": "Li RongQing", "email": "roy.qing.li@gmail.com", "time": "Wed Jan 15 17:03:30 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 15 15:53:18 2014 -0800" }, "message": "ipv6: move IPV6_TCLASS_SHIFT into ipv6.h and define a helper\n\nTwo places defined IPV6_TCLASS_SHIFT, so we should move it into ipv6.h,\nand use this macro as possible. And define ip6_tclass helper to return\ntclass\n\nSigned-off-by: Li RongQing \u003croy.qing.li@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec35b61ea59aa6b1ecc8d8452b225e4677e32627", "tree": "e1ca5bd62514639fce20cc381d51feac1ed6bf36", "parents": [ "0e864b21e5080bc3f178a4729bc4f7bca77188bc" ], "author": { "name": "FX Le Bail", "email": "fx.lebail@yahoo.com", "time": "Mon Jan 13 15:59:01 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 14 18:18:22 2014 -0800" }, "message": "IPv6: move the anycast_src_echo_reply sysctl to netns_sysctl_ipv6\n\nThis change move anycast_src_echo_reply sysctl with other ipv6 sysctls.\n\nSuggested-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: Francois-Xavier Le Bail \u003cfx.lebail@yahoo.com\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "63862b5bef7349dd1137e4c70702c67d77565785", "tree": "ad50ec4a9d67fd025a29093dc5a4b493fe02e8a5", "parents": [ "825edac4e78ded9e621c167a4f47a2392bd9e082" ], "author": { "name": "Aruna-Hewapathirane", "email": "aruna.hewapathirane@gmail.com", "time": "Sat Jan 11 07:15:59 2014 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 14 15:15:25 2014 -0800" }, "message": "net: replace macros net_random and net_srandom with direct calls to prandom\n\nThis patch removes the net_random and net_srandom macros and replaces\nthem with direct calls to the prandom ones. As new commits only seem to\nuse prandom_u32 there is no use to keep them around.\nThis change makes it easier to grep for users of prandom_u32.\n\nSigned-off-by: Aruna-Hewapathirane \u003caruna.hewapathirane@gmail.com\u003e\nSuggested-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "72c1d3bdd5bf10a789608336ba0d61f1e44e4350", "tree": "92f31ffd05e582d17bb8e9e2a857750a52118a72", "parents": [ "c49fa0166391279249483d61511c358580e29ee4" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Fri Jan 10 16:09:45 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 14 15:03:33 2014 -0800" }, "message": "ipv4: register igmp_notifier even when !CONFIG_PROC_FS\n\nWe still need this notifier even when we don\u0027t config\nPROC_FS.\n\nIt should be rare to have a kernel without PROC_FS,\nso just for completeness.\n\nCc: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aef2b45fe459428d1861a74b08f3f57e87411f56", "tree": "c2a4438c1b65afd6f805efe274817b9f04270dae", "parents": [ "2afe02eed1ac565e5ba90254706e67f670ae41a2", "6bae919003602729d6f5920315bf71ca78bd9e48" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 13 23:14:25 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 13 23:14:25 2014 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next\n\nConflicts:\n\tnet/xfrm/xfrm_policy.c\n\nSteffen Klassert says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nThis pull request has a merge conflict between commits be7928d20bab\n(\"net: xfrm: xfrm_policy: fix inline not at beginning of declaration\") and\nda7c224b1baa (\"net: xfrm: xfrm_policy: silence compiler warning\") from\nthe net-next tree and commit 2f3ea9a95c58 (\"xfrm: checkpatch erros with\ninline keyword position\") from the ipsec-next tree.\n\nThe version from net-next can be used, like it is done in linux-next.\n\n1) Checkpatch cleanups, from Weilong Chen.\n\n2) Fix lockdep complaints when pktgen is used with IPsec,\n from Fan Du.\n\n3) Update pktgen to allow any combination of IPsec transport/tunnel mode\n and AH/ESP/IPcomp type, from Fan Du.\n\n4) Make pktgen_dst_metrics static, Fengguang Wu.\n\n5) Compile fix for pktgen when CONFIG_XFRM is not set,\n from Fan Du.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4440e8548153e9e6d56db9abe6f3bc0e5b9eb74f", "tree": "1752c5edd77a746fdb2aad2806b31fbe4dd39a76", "parents": [ "ff235f51a138fc61e1a22dcb8b072d9c78c2a8cc" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Wed Nov 27 17:35:17 2013 -0500" }, "committer": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Mon Jan 13 22:31:46 2014 -0500" }, "message": "audit: convert all sessionid declaration to unsigned int\n\nRight now the sessionid value in the kernel is a combination of u32,\nint, and unsigned int. Just use unsigned int throughout.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nSigned-off-by: Richard Guy Briggs \u003crgb@redhat.com\u003e\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\n" }, { "commit": "6daaf0de2f3170206f57e7881adfbd8682cdd7fb", "tree": "66160bfbc486c44654acb541c5d35016738497ff", "parents": [ "7614aba6a330a6c4937edc24fd4c6a935c1ae703" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Thu Jan 09 22:31:11 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 13 14:42:30 2014 -0800" }, "message": "sctp: make sctp_addto_chunk_fixed local\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7eb8896df03d0f4a8b301cb177d7f31c0d70e112", "tree": "c76752e5c9925171b4c91bbfcea516ededdc8e12", "parents": [ "a8701a6c7ae0142393d0fe87a1e7778bd04d1ac7" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Thu Jan 09 16:14:05 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 13 11:50:15 2014 -0800" }, "message": "net_sched: act: remove struct tcf_act_hdr\n\nIt is not necessary at all.\n\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2519a602c273c5254781bc55b6e678a17e469a12", "tree": "fcfbf3b98b6e186ea042d8167ddbde5b4fff63f2", "parents": [ "832d1d5bfaefafa5aa40282f6765c6d996fe384e" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Thu Jan 09 16:14:02 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 13 11:50:15 2014 -0800" }, "message": "net_sched: optimize tcf_match_indev()\n\ntcf_match_indev() is called in fast path, it is not wise to\nsearch for a netdev by ifindex and then compare by its name,\njust compare the ifindex.\n\nAlso, dev-\u003ename could be changed by user-space, therefore\nthe match would be always fail, but dev-\u003eifindex could\nbe consistent.\n\nBTW, this will also save some bytes from the core struct of u32.\n\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "832d1d5bfaefafa5aa40282f6765c6d996fe384e", "tree": "2dd7b013f0a2b621a4346dad8d22c8374cd10eb2", "parents": [ "a56e19538d02ade9ee6ae82da4a216d7a632e8d5" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Thu Jan 09 16:14:01 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 13 11:50:14 2014 -0800" }, "message": "net_sched: add struct net pointer to tcf_proto_ops-\u003edump\n\nIt will be needed by the next patch.\n\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ddafd34f419546f1eb7c343178685f059c3cf127", "tree": "56eacb6abe0c856904632e437baf6cef62cbb39c", "parents": [ "600adc18eba823f9fd8ed5fec8b04f11dddf3884" ], "author": { "name": "WANG Cong", "email": "xiyou.wangcong@gmail.com", "time": "Thu Jan 09 16:13:59 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 13 11:50:14 2014 -0800" }, "message": "net_sched: act: move idx_gen into struct tcf_hashinfo\n\nThere is no need to store the index separatedly\nsince tcf_hashinfo is allocated statically too.\n\nCc: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4f7b91404cd5da3657a82b00394f4f5dfbff13d6", "tree": "d111dd2ecec10bddc417f77b3f75203fd064acb0", "parents": [ "8fc685803a8d7b42a5f69dcad7f7cef6f8b60edf" ], "author": { "name": "Luis R. Rodriguez", "email": "mcgrof@do-not-panic.com", "time": "Sat Dec 14 20:09:06 2013 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 13 14:46:58 2014 -0500" }, "message": "cfg80211: make regulatory_hint() remove REGULATORY_CUSTOM_REG\n\nThe REGULATORY_CUSTOM_REG can be used during early init with\nthe goal of overriding the wiphy\u0027s default regulatory settings\nin case the alpha2 of the device is not known. In the case that\nthe alpha2 becomes known lets avoid having drivers having to\nclear the REGULATORY_CUSTOM_REG flag by doing it for them\nwhen regulatory_hint() is used.\n\nCc: Sujith Manoharan \u003cc_manoha@qca.qualcomm.com\u003e\nSigned-off-by: Luis R. Rodriguez \u003cmcgrof@do-not-panic.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "f13352519ee8c4b22b87fc1a47743d1f53ea193e", "tree": "48c18144f3e5e530ec61d5eadbb5a34675a69fe8", "parents": [ "559c33d84da71e07816e692bfd73ad92675256a6", "26b0e411d37a2ca5992d02884dc3fa4e1907e598" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 13 14:40:59 2014 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 13 14:40:59 2014 -0500" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next\n" }, { "commit": "ec665facde820179d71d0f064e692f449df2b94f", "tree": "68725bffefc5c304756e7949dbdb09078790b5b3", "parents": [ "1e2f9295f4c657500111514f92a3d3894d0e05b4", "bb55dc2ae4367b8f711d43a2f8668a6ed42c4fd3" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 13 14:36:42 2014 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 13 14:36:42 2014 -0500" }, "message": "Merge tag \u0027nfc-next-3.14-1\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next\n\nSamuel Ortiz \u003csameo@linux.intel.com\u003e says:\n\n\"This is the first NFC pull request for 3.14\n\nIt includes:\n\n* A new NFC driver for Marvell\u0027s 8897, and a few NCI fixes and\n improvements needed to support this chipset.\n\n* An LLCP fix for how we were setting the default MIU on a p2p link. If\n there is no explicit MIU extension announced at connection time, we\n must use the default one and not the one announced at LLCP link\n establishement time.\n\n* A pn544 EEPROM config update. Some of the currently EEPROM configured\n values are overwriting the firmware ones while other should not be set\n by the driver itself.\n\n* Some NFC digital stack fixes and improvements. Asynchronous functions\n are better documented, RF technologies and CRC functions are set upon\n PSL_REQ reception, and a few minor bugs are fixed.\n\n* Minor and miscelaneous pn533, mei_phy and port100 fixes.\"\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8ed1dc44d3e9e8387a104b1ae8f92e9a3fbf1b1e", "tree": "4a8093c0dfa1507ce234754a54db8a95399955a4", "parents": [ "0954cf9c6141d597929a292b93a2dca2c1f29159" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Thu Jan 09 10:01:17 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 13 11:22:55 2014 -0800" }, "message": "ipv4: introduce hardened ip_no_pmtu_disc mode\n\nThis new ip_no_pmtu_disc mode only allowes fragmentation-needed errors\nto be honored by protocols which do more stringent validation on the\nICMP\u0027s packet payload. This knob is useful for people who e.g. want to\nrun an unmodified DNS server in a namespace where they need to use pmtu\nfor TCP connections (as they are used for zone transfers or fallback\nfor requests) but don\u0027t want to use possibly spoofed UDP pmtu information.\n\nCurrently the whitelisted protocols are TCP, SCTP and DCCP as they check\nif the returned packet is in the window or if the association is valid.\n\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: John Heffner \u003cjohnwheffner@gmail.com\u003e\nSuggested-by: Florian Weimer \u003cfweimer@redhat.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f87c10a8aa1e82498c42d0335524d6ae7cf5a52b", "tree": "85117fae4f0f25831d4232155b47f3f6553faf27", "parents": [ "6c76a07a711165a31332aa619215f961b115071d" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Thu Jan 09 10:01:15 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 13 11:22:54 2014 -0800" }, "message": "ipv4: introduce ip_dst_mtu_maybe_forward and protect forwarding path against pmtu spoofing\n\nWhile forwarding we should not use the protocol path mtu to calculate\nthe mtu for a forwarded packet but instead use the interface mtu.\n\nWe mark forwarded skbs in ip_forward with IPSKB_FORWARDED, which was\nintroduced for multicast forwarding. But as it does not conflict with\nour usage in unicast code path it is perfect for reuse.\n\nI moved the functions ip_sk_accept_pmtu, ip_sk_use_pmtu and ip_skb_dst_mtu\nalong with the new ip_dst_mtu_maybe_forward to net/ip.h to fix circular\ndependencies because of IPSKB_FORWARDED.\n\nBecause someone might have written a software which does probe\ndestinations manually and expects the kernel to honour those path mtus\nI introduced a new per-namespace \"ip_forward_use_pmtu\" knob so someone\ncan disable this new behaviour. We also still use mtus which are locked on a\nroute for forwarding.\n\nThe reason for this change is, that path mtus information can be injected\ninto the kernel via e.g. icmp_err protocol handler without verification\nof local sockets. As such, this could cause the IPv4 forwarding path to\nwrongfully emit fragmentation needed notifications or start to fragment\npackets along a path.\n\nTunnel and ipsec output paths clear IPCB again, thus IPSKB_FORWARDED\nwon\u0027t be set and further fragmentation logic will use the path mtu to\ndetermine the fragmentation size. They also recheck packet size with\nhelp of path mtu discovery and report appropriate errors.\n\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: John Heffner \u003cjohnwheffner@gmail.com\u003e\nCc: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "37089834528be3ef8cbf927e47c753b3e272a856", "tree": "9cce66ba40e5c0684b3e4f4f354dd717aa1fef84", "parents": [ "1774e9f3e5c8b38de3b3bc8bd0eacd280f655baf" ], "author": { "name": "Peter Zijlstra", "email": "peterz@infradead.org", "time": "Tue Nov 19 16:13:38 2013 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Mon Jan 13 17:39:11 2014 +0100" }, "message": "sched, net: Fixup busy_loop_us_clock()\n\nThe only valid use of preempt_enable_no_resched() is if the very next\nline is schedule() or if we know preemption cannot actually be enabled\nby that statement due to known more preempt_count \u0027refs\u0027.\n\nThis busy_poll stuff looks to be completely and utterly broken,\nsched_clock() can return utter garbage with interrupts enabled (rare\nbut still) and it can drift unbounded between CPUs.\n\nThis means that if you get preempted/migrated and your new CPU is\nyears behind on the previous CPU we get to busy spin for a _very_ long\ntime.\n\nThere is a _REASON_ sched_clock() warns about preemptability -\npapering over it with a preempt_disable()/preempt_enable_no_resched()\nis just terminal brain damage on so many levels.\n\nReplace sched_clock() usage with local_clock() which has a bounded\ndrift between CPUs (\u003c2 jiffies).\n\nThere is a further problem with the entire busy wait poll thing in\nthat the spin time is additive to the syscall timeout, not inclusive.\n\nReviewed-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: rui.zhang@intel.com\nCc: jacob.jun.pan@linux.intel.com\nCc: Mike Galbraith \u003cbitbucket@online.de\u003e\nCc: hpa@zytor.com\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: lenb@kernel.org\nCc: rjw@rjwysocki.net\nCc: Eliezer Tamir \u003celiezer.tamir@linux.intel.com\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/20131119151338.GF3694@twins.programming.kicks-ass.net\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "235f93922878234f3d99a4205ebe3634ee955919", "tree": "1c61b53899e26839941e46d9f6e4bba28ddd23b5", "parents": [ "11b57f90257c1d6a91cee720151b69e0c2020cf6", "1e2f9295f4c657500111514f92a3d3894d0e05b4" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 10 10:59:40 2014 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jan 10 10:59:40 2014 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tnet/ieee802154/6lowpan.c\n" }, { "commit": "b77cf4f8e1892e192ec52df5dd8c158b300fc496", "tree": "ae0ba22c24b9c125a004ae672113cf1b8236d4f7", "parents": [ "03c8c06f2d080b841ecbfc63253228ba6efcab08" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jan 09 00:00:38 2014 +0100" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Jan 10 09:50:02 2014 +0100" }, "message": "mac80211: handle MMPDUs at EOSP correctly\n\nIf a uAPSD service period ends with an MMPDU, we currently just\nsend that MMPDU, but it obviously won\u0027t get the EOSP bit set as\nit doesn\u0027t have a QoS header. This contradicts the standard, so\nadd a QoS-nulldata frame after the MMPDU to properly terminate\nthe service period with a frame that has EOSP set.\n\nAlso fix a bug wrt. the TID for the MMPDU, it shouldn\u0027t be set\nto 0 unconditionally but use the actual TID that was assigned.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "3876d22dba62ebf6582f33e1ef2160eeb95e1129", "tree": "b4ee6d922f5523a03f78268d9e958abb768c70a8", "parents": [ "44a6f0df039ee7ddeebc88327dd61f0afb53baa7" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jan 09 18:42:43 2014 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jan 09 20:17:16 2014 +0100" }, "message": "netfilter: nf_tables: rename nft_do_chain_pktinfo() to nft_do_chain()\n\nWe don\u0027t encode argument types into function names and since besides\nnft_do_chain() there are only AF-specific versions, there is no risk\nof confusion.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "fa2c1de0bbd98985f7f930205de97ae0d3e86c16", "tree": "f9f8eec3da27c7934a2241bf05e5054a9767eddf", "parents": [ "2a37d755b885995443f11cdcaf1f9d4b5f246eab" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jan 09 18:42:38 2014 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jan 09 20:17:15 2014 +0100" }, "message": "netfilter: nf_tables: minor nf_chain_type cleanups\n\nMinor nf_chain_type cleanups:\n\n- reorder struct to plug a hoe\n- rename struct module member to \"owner\" for consistency\n- rename nf_hookfn array to \"hooks\" for consistency\n- reorder initializers for better readability\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "2a37d755b885995443f11cdcaf1f9d4b5f246eab", "tree": "8ae3cefff2147663baae9336c555930260f335d8", "parents": [ "93b0806f006b8b3ecb7a6183fcad21e88f39904f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jan 09 18:42:37 2014 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jan 09 20:17:15 2014 +0100" }, "message": "netfilter: nf_tables: constify chain type definitions and pointers\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "baae3e62f31618d90e08fb886b4481e5d7b7f27c", "tree": "706f332147b442369fd5e8219fad73dae2c80a4e", "parents": [ "758206760cbadf66dc31d6587f5958691b34e9e5" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jan 09 18:42:34 2014 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jan 09 20:17:14 2014 +0100" }, "message": "netfilter: nf_tables: fix chain type module reference handling\n\nThe chain type module reference handling makes no sense at all: we take\na reference immediately when the module is registered, preventing the\nmodule from ever being unloaded.\n\nFix by taking a reference when we\u0027re actually creating a chain of the\nchain type and release the reference when destroying the chain.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "bdfbec2d2d240e9c528caae9c743801629b60166", "tree": "d35ed71d3af26f7bbc681da4cbfcee99f8685476", "parents": [ "685328b296acc810541d2532957912690273c64a" ], "author": { "name": "Ilan Peer", "email": "ilan.peer@intel.com", "time": "Thu Jan 09 11:37:23 2014 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jan 09 14:24:24 2014 +0100" }, "message": "cfg80211: Add a function to get the number of supported channels\n\nAdd a utility function to get the number of channels supported by\nthe device, and update the places in the code that need this data.\n\nSigned-off-by: Ilan Peer \u003cilan.peer@intel.com\u003e\n[replace another occurrence in libertas, fix kernel-doc, fix bugs]\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "300e5fd160114920079dd3ec132e5c01d00e4a1d", "tree": "6032c96747aeae7544be71e4f3b7e2866a21bb1c", "parents": [ "6e08d757b72f280c45cfec61e63216adb419e2dd", "e825eb1d7e06f616003c17e2e8e421c2e5e44142" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 08 13:44:29 2014 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 08 13:44:29 2014 -0500" }, "message": "Merge branch \u0027for-upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next\n" }, { "commit": "4566bf27069b7780e453cffb24ea5f5323059885", "tree": "216307284d8588c3a1250dc01c956f4b40b9809c", "parents": [ "124edfa9e0451e97d621cd2796a44ff499e21036" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 03 12:16:18 2014 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Jan 07 23:57:31 2014 +0100" }, "message": "netfilter: nft_meta: add l4proto support\n\nFor L3-proto independant rules we need to get at the L4 protocol value\ndirectly. Add it to the nft_pktinfo struct and use the meta expression\nto retrieve it.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "1d49144c0aaa61be4e3ccbef9cc5c40b0ec5f2fe", "tree": "1711f39fb9f9ba1fed9bcb9afcf55499b0cef3b6", "parents": [ "115a60b173af0170e0db26b9a3fd6a911fba70a3" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 03 12:16:16 2014 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Jan 07 23:57:25 2014 +0100" }, "message": "netfilter: nf_tables: add \"inet\" table for IPv4/IPv6\n\nThis patch adds a new table family and a new filter chain that you can\nuse to attach IPv4 and IPv6 rules. This should help to simplify\nrule-set maintainance in dual-stack setups.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "115a60b173af0170e0db26b9a3fd6a911fba70a3", "tree": "83fac6bf34087f357d9fe30ff916dfa2448a5d40", "parents": [ "c9484874e7596d6c890e4130336f5379f6a59c5f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 03 12:16:15 2014 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Jan 07 23:55:46 2014 +0100" }, "message": "netfilter: nf_tables: add support for multi family tables\n\nAdd support to register chains to multiple hooks for different address\nfamilies for mixed IPv4/IPv6 tables.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "c9484874e7596d6c890e4130336f5379f6a59c5f", "tree": "137a798b9c7b87f4a817d22c795a22614f03be42", "parents": [ "3b088c4bc0035da662faa81818ba217e34c4bba4" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jan 03 12:16:14 2014 +0000" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Jan 07 23:50:43 2014 +0100" }, "message": "netfilter: nf_tables: add hook ops to struct nft_pktinfo\n\nMulti-family tables need the AF from the hook ops. Add a pointer to the\nhook ops and replace usage of the hooknum member in struct nft_pktinfo.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "685328b296acc810541d2532957912690273c64a", "tree": "2d7455cae4bf9c8ae3525a3284b964f5dd0895da", "parents": [ "349b196044d38a3bf5be2b4dd2fe28ca2f12a258" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Jan 06 22:24:00 2014 +0100" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jan 07 23:16:39 2014 +0100" }, "message": "mac80211: remove channel_change_time\n\nThis value is no longer used by mac80211, and practically no\ndriver ever set it to a correct value anyway, so remove it.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "509aba3b0d366b7f16a9a2eebac1156b25f5f622", "tree": "703f6a9807c1cc5f2ae451831f4ffe7eb2861baf", "parents": [ "9ba75fb0c4b92416b94640b5a043c323a457f14a" ], "author": { "name": "FX Le Bail", "email": "fx.lebail@yahoo.com", "time": "Tue Jan 07 14:57:27 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 07 15:51:39 2014 -0500" }, "message": "IPv6: add the option to use anycast addresses as source addresses in echo reply\n\nThis change allows to follow a recommandation of RFC4942.\n\n- Add \"anycast_src_echo_reply\" sysctl to control the use of anycast addresses\n as source addresses for ICMPv6 echo reply. This sysctl is false by default\n to preserve existing behavior.\n- Add inline check ipv6_anycast_destination().\n- Use them in icmpv6_echo_reply().\n\nReference:\nRFC4942 - IPv6 Transition/Coexistence Security Considerations\n (http://tools.ietf.org/html/rfc4942#section-2.1.6)\n\n2.1.6. Anycast Traffic Identification and Security\n\n [...]\n To avoid exposing knowledge about the internal structure of the\n network, it is recommended that anycast servers now take advantage of\n the ability to return responses with the anycast address as the\n source address if possible.\n\nSigned-off-by: Francois-Xavier Le Bail \u003cfx.lebail@yahoo.com\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "438e38fadca2f6e57eeecc08326c8a95758594d4", "tree": "8c71bf332c0827545b2ece7471c09a4489cba5dc", "parents": [ "0e5959346cb859851e99ed87bd07f76ed5bb3a37" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Mon Jan 06 14:03:07 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 06 20:28:34 2014 -0500" }, "message": "gre_offload: statically build GRE offloading support\n\nGRO/GSO layers can be enabled on a node, even if said\nnode is only forwarding packets.\n\nThis patch permits GSO (and upcoming GRO) support for GRE\nencapsulated packets, even if the host has no GRE tunnel setup.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: H.K. Jerry Chu \u003chkchu@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "39b6b2992f9dc65d1de5c66e7ec2271b8a5fac33", "tree": "c0fc4e2be0429bb4d7643e6b6f8f5a56212f9284", "parents": [ "56a4342dfe3145cd66f766adccb28fd9b571606d", "443cd88c8a31379e95326428bbbd40af25c1d440" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 06 19:48:38 2014 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 06 19:48:38 2014 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch\n\nJesse Gross says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[GIT net-next] Open vSwitch\n\nOpen vSwitch changes for net-next/3.14. Highlights are:\n * Performance improvements in the mechanism to get packets to userspace\n using memory mapped netlink and skb zero copy where appropriate.\n * Per-cpu flow stats in situations where flows are likely to be shared\n across CPUs. Standard flow stats are used in other situations to save\n memory and allocation time.\n * A handful of code cleanups and rationalization.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22c15bf30b70ab2eae300f093ffc64e182620aba", "tree": "e191a88c1cd70dd0281cad5b69e3ca79671451d0", "parents": [ "86e8586ed5beea15ce7c359f02a1084c2da93bc7" ], "author": { "name": "Amitkumar Karwar", "email": "akarwar@marvell.com", "time": "Mon Jan 06 12:58:18 2014 -0800" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Jan 07 01:32:40 2014 +0100" }, "message": "NFC: NCI: Add set_config API\n\nThis API can be used by drivers to send their custom\nconfiguration using SET_CONFIG NCI command to the device.\n\nSigned-off-by: Amitkumar Karwar \u003cakarwar@marvell.com\u003e\nSigned-off-by: Bing Zhao \u003cbzhao@marvell.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "86e8586ed5beea15ce7c359f02a1084c2da93bc7", "tree": "f971986461bb5059d0d5ff74234803bb742c9fe2", "parents": [ "1907299867431fd899ae630a29b08b878ca1e50f" ], "author": { "name": "Amitkumar Karwar", "email": "akarwar@marvell.com", "time": "Mon Jan 06 12:58:17 2014 -0800" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Tue Jan 07 01:32:40 2014 +0100" }, "message": "NFC: NCI: Add setup handler\n\nSome drivers require special configuration while initializing.\nThis patch adds setup handler for this custom configuration.\n\nSigned-off-by: Amitkumar Karwar \u003cakarwar@marvell.com\u003e\nSigned-off-by: Bing Zhao \u003cbzhao@marvell.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "bb9b18fb55b03477fe5bdd3e97245d6d4d3dee4f", "tree": "02d730abd6f31752a842f8c1d9f30d62d185e0b2", "parents": [ "663efa3696232300a8ad3a46bb10482fc0b861cf" ], "author": { "name": "Thomas Graf", "email": "tgraf@suug.ch", "time": "Sat Nov 30 13:21:30 2013 +0100" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Mon Jan 06 15:51:53 2014 -0800" }, "message": "genl: Add genlmsg_new_unicast() for unicast message allocation\n\nAllocates a new sk_buff large enough to cover the specified payload\nplus required Netlink headers. Will check receiving socket for\nmemory mapped i/o capability and use it if enabled. Will fall back\nto non-mapped skb if message size exceeds the frame size of the ring.\n\nSigned-of-by: Thomas Graf \u003ctgraf@suug.ch\u003e\nReviewed-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "56a4342dfe3145cd66f766adccb28fd9b571606d", "tree": "d1593764488ff8cbb0b83cb9ae35fd968bf81760", "parents": [ "805c1f4aedaba1bc8d839e7c27b128083dd5c2f0", "fe0d692bbc645786bce1a98439e548ae619269f5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 06 17:37:45 2014 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 06 17:37:45 2014 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c\n\tnet/ipv6/ip6_tunnel.c\n\tnet/ipv6/ip6_vti.c\n\nipv6 tunnel statistic bug fixes conflicting with consolidation into\ngeneric sw per-cpu net stats.\n\nqlogic conflict between queue counting bug fix and the addition\nof multiple MAC address support.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9aa28f2b71055d5ae17a2e1daee359d4174bb13e", "tree": "fbf4e0fd11eb924e0bece74a87f442bc54441b35", "parents": [ "6a8c4796df74045088a916581c736432d08c53c0", "c9c8e485978a308c8a359140da187d55120f8fee" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 06 13:29:30 2014 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 06 13:29:30 2014 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables\n\nPablo Neira Ayuso says: \u003cpablo@netfilter.org\u003e\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nnftables updates for net-next\n\nThe following patchset contains nftables updates for your net-next tree,\nthey are:\n\n* Add set operation to the meta expression by means of the select_ops()\n infrastructure, this allows us to set the packet mark among other things.\n From Arturo Borrero Gonzalez.\n\n* Fix wrong format in sscanf in nf_tables_set_alloc_name(), from Daniel\n Borkmann.\n\n* Add new queue expression to nf_tables. These comes with two previous patches\n to prepare this new feature, one to add mask in nf_tables_core to\n evaluate the queue verdict appropriately and another to refactor common\n code with xt_NFQUEUE, from Eric Leblond.\n\n* Do not hide nftables from Kconfig if nfnetlink is not enabled, also from\n Eric Leblond.\n\n* Add the reject expression to nf_tables, this adds the missing TCP RST\n support. It comes with an initial patch to refactor common code with\n xt_NFQUEUE, again from Eric Leblond.\n\n* Remove an unused variable assignment in nf_tables_dump_set(), from Michal\n Nazarewicz.\n\n* Remove the nft_meta_target code, now that Arturo added the set operation\n to the meta expression, from me.\n\n* Add help information for nf_tables to Kconfig, also from me.\n\n* Allow to dump all sets by specifying NFPROTO_UNSPEC, similar feature is\n available to other nf_tables objects, requested by Arturo, from me.\n\n* Expose the table usage counter, so we can know how many chains are using\n this table without dumping the list of chains, from Tomasz Bursztyka.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "855404efae0d449cc491978d54ea5d117a3cb271", "tree": "3c44948365a77058d8b1f2ed6e6683bfc52ef256", "parents": [ "a1d4b03a076d95edc88d070f7627a73ab80abddc", "82a37132f300ea53bdcd812917af5a6329ec80c3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 05 20:18:50 2014 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 05 20:18:50 2014 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next\n\nPablo Neira Ayuso says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nnetfilter/IPVS updates for net-next\n\nThe following patchset contains Netfilter updates for your net-next tree,\nthey are:\n\n* Add full port randomization support. Some crazy researchers found a way\n to reconstruct the secure ephemeral ports that are allocated in random mode\n by sending off-path bursts of UDP packets to overrun the socket buffer of\n the DNS resolver to trigger retransmissions, then if the timing for the\n DNS resolution done by a client is larger than usual, then they conclude\n that the port that received the burst of UDP packets is the one that was\n opened. It seems a bit aggressive method to me but it seems to work for\n them. As a result, Daniel Borkmann and Hannes Frederic Sowa came up with a\n new NAT mode to fully randomize ports using prandom.\n\n* Add a new classifier to x_tables based on the socket net_cls set via\n cgroups. These includes two patches to prepare the field as requested by\n Zefan Li. Also from Daniel Borkmann.\n\n* Use prandom instead of get_random_bytes in several locations of the\n netfilter code, from Florian Westphal.\n\n* Allow to use the CTA_MARK_MASK in ctnetlink when mangling the conntrack\n mark, also from Florian Westphal.\n\n* Fix compilation warning due to unused variable in IPVS, from Geert\n Uytterhoeven.\n\n* Add support for UID/GID via nfnetlink_queue, from Valentina Giusti.\n\n* Add IPComp extension to x_tables, from Fan Du.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f84985fec10de64a6b4cdfea45f2b0ab8f07c78", "tree": "03d58e9d72384e8066a6232c793b3ee4242668f6", "parents": [ "653864d9dd6ae26d884abfd53420e61e7383b1da" ], "author": { "name": "Li RongQing", "email": "roy.qing.li@gmail.com", "time": "Sat Jan 04 13:57:59 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 04 20:10:24 2014 -0500" }, "message": "net: unify the pcpu_tstats and br_cpu_netstats as one\n\nThey are same, so unify them as one, pcpu_sw_netstats.\n\nDefine pcpu_sw_netstat in netdevice.h, remove pcpu_tstats\nfrom if_tunnel and remove br_cpu_netstats from br_private.h\n\nCc: Cong Wang \u003cxiyou.wangcong@gmail.com\u003e\nCc: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: Li RongQing \u003croy.qing.li@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9f462faa02777f497eb25255683a94e0c054de6", "tree": "72ef22cb0c6c553537ba3018e223404ae084423e", "parents": [ "bc7219709978b963bc6820717e140c15547a6dd9" ], "author": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Fri Jan 03 03:02:35 2014 -0800" }, "committer": { "name": "Johan Hedberg", "email": "johan.hedberg@intel.com", "time": "Sat Jan 04 20:10:40 2014 +0200" }, "message": "Bluetooth: Add quirk for disabling Delete Stored Link Key command\n\nSome controller pretend they support the Delete Stored Link Key command,\nbut in reality they really don\u0027t support it.\n\n \u003c HCI Command: Delete Stored Link Key (0x03|0x0012) plen 7\n bdaddr 00:00:00:00:00:00 all 1\n \u003e HCI Event: Command Complete (0x0e) plen 4\n Delete Stored Link Key (0x03|0x0012) ncmd 1\n status 0x11 deleted 0\n Error: Unsupported Feature or Parameter Value\n\nNot correctly supporting this command causes the controller setup to\nfail and will make a device not work. However sending the command for\ncontroller that handle stored link keys is important. This quirk\nallows a driver to disable the command if it knows that this command\nhandling is broken.\n\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\n" }, { "commit": "444fb98eed98f7292a83f9bf123d1c78f171327e", "tree": "9aa011b169ca27e03fddaf7913ceaf7d8f97e167", "parents": [ "ea87a5efa9efa84cd48fbf7a969d951b32c9e5e4" ], "author": { "name": "Thierry Escande", "email": "thierry.escande@linux.intel.com", "time": "Thu Jan 02 11:58:12 2014 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sat Jan 04 03:35:34 2014 +0100" }, "message": "NFC: digital: Add a note about asynchronous functions\n\nThis explains how and why the timeout parameter must be handled by the\ndriver implementation.\n\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "5e419e68a6450da279e8add304629774133576a9", "tree": "ee643a65864ba87216a0aba29552275922137062", "parents": [ "8f09898bf02fc24b7a525e9cfc78f38dcdf3a4eb" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Fri Jan 03 09:19:51 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 03 20:56:48 2014 -0500" }, "message": "llc: make lock static\n\nThe llc_sap_list_lock does not need to be global, only acquired\nin core.\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f09898bf02fc24b7a525e9cfc78f38dcdf3a4eb", "tree": "3d1203021bddbc009ea41bbe8e9c66ffe61afa08", "parents": [ "128296fc3fa2f607050cc2c5d6dc90237f3cedb3" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Fri Jan 03 09:17:14 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 03 20:55:58 2014 -0500" }, "message": "socket: cleanups\n\nNamespace related cleaning\n\n * make cred_to_ucred static\n * remove unused sock_rmalloc function\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9a4aa9af447f784f0a47313c8dcb79ac63442cf7", "tree": "e5e6d38f79704d282679a06d6bf00cf819a85d7a", "parents": [ "7d442fab0a6777fd7612cfcada32ea859553d370" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Thu Jan 02 11:48:33 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 03 19:40:57 2014 -0500" }, "message": "ipv4: Use percpu Cache route in IP tunnels\n\npercpu route cache eliminates share of dst refcnt between CPUs.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7d442fab0a6777fd7612cfcada32ea859553d370", "tree": "3d5282fdd3007f33565e482e2dffbdd55dab7703", "parents": [ "f916ec9608af017dda3e0fa7b5c6a344fc05285e" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Thu Jan 02 11:48:26 2014 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jan 03 19:38:45 2014 -0500" }, "message": "ipv4: Cache dst in tunnels\n\nAvoid doing a route lookup on every packet being tunneled.\n\nIn ip_tunnel.c cache the route returned from ip_route_output if\nthe tunnel is \"connected\" so that all the rouitng parameters are\ntaken from tunnel parms for a packet. Specifically, not NBMA tunnel\nand tos is from tunnel parms (not inner packet).\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "86f8515f9721fa171483f0fe0391968fbb949cc9", "tree": "a21f4df024bc16044cb174948494180769cbcbbe", "parents": [ "fe1217c4f3f7d7cbf8efdd8dd5fdc7204a1d65a8" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Sun Dec 29 17:27:11 2013 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Jan 03 23:41:42 2014 +0100" }, "message": "net: netprio: rename config to be more consistent with cgroup configs\n\nWhile we\u0027re at it and introduced CGROUP_NET_CLASSID, lets also make\nNETPRIO_CGROUP more consistent with the rest of cgroups and rename it\ninto CONFIG_CGROUP_NET_PRIO so that for networking, we now have\nCONFIG_CGROUP_NET_{PRIO,CLASSID}. This not only makes the CONFIG\noption consistent among networking cgroups, but also among cgroups\nCONFIG conventions in general as the vast majority has a prefix of\nCONFIG_CGROUP_\u003cSUBSYS\u003e.\n\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nCc: Zefan Li \u003clizefan@huawei.com\u003e\nCc: cgroups@vger.kernel.org\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "fe1217c4f3f7d7cbf8efdd8dd5fdc7204a1d65a8", "tree": "ac34c3a9183c96cbe695a29614de6f65a7934849", "parents": [ "14abfa161d256c60f3ea6ba494704ac634b94f63" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Sun Dec 29 18:27:10 2013 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Jan 03 23:41:41 2014 +0100" }, "message": "net: net_cls: move cgroupfs classid handling into core\n\nZefan Li requested [1] to perform the following cleanup/refactoring:\n\n- Split cgroupfs classid handling into net core to better express a\n possible more generic use.\n\n- Disable module support for cgroupfs bits as the majority of other\n cgroupfs subsystems do not have that, and seems to be not wished\n from cgroup side. Zefan probably might want to follow-up for netprio\n later on.\n\n- By this, code can be further reduced which previously took care of\n functionality built when compiled as module.\n\ncgroupfs bits are being placed under net/core/netclassid_cgroup.c, so\nthat we are consistent with {netclassid,netprio}_cgroup naming that is\nunder net/core/ as suggested by Zefan.\n\nNo change in functionality, but only code refactoring that is being\ndone here.\n\n [1] http://patchwork.ozlabs.org/patch/304825/\n\nSuggested-by: Li Zefan \u003clizefan@huawei.com\u003e\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nCc: Zefan Li \u003clizefan@huawei.com\u003e\nCc: Thomas Graf \u003ctgraf@suug.ch\u003e\nCc: cgroups@vger.kernel.org\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "dcd93ed4cd1669b2c1510e801fe5f1132390761c", "tree": "28049dbc7702c0c453f1af93359b3e5f24b342d9", "parents": [ "02eca9d2cc541806e8f03b4131c7ee9120246df7" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Mon Dec 30 17:16:08 2013 -0800" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Jan 03 23:41:37 2014 +0100" }, "message": "netfilter: nf_conntrack: remove dead code\n\nThe following code is not used in current upstream code.\nSome of this seems to be old hooks, other might be used by some\nout of tree module (which I don\u0027t care about breaking), and\nthe need_ipv4_conntrack was used by old NAT code but no longer\ncalled.\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "c454997e68eb013510ba128283ad3b4aefeff630", "tree": "c32cd7284c1e831c84aa962bced9fb0d816b5c51", "parents": [ "cf93d47ed4489cc349678f397290b3ecba868a3b" ], "author": { "name": "Fan Du", "email": "fan.du@windriver.com", "time": "Fri Jan 03 11:18:32 2014 +0800" }, "committer": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Fri Jan 03 07:29:12 2014 +0100" }, "message": "{pktgen, xfrm} Introduce xfrm_state_lookup_byspi for pktgen\n\nIntroduce xfrm_state_lookup_byspi to find user specified by custom\nfrom \"pgset spi xxx\". Using this scheme, any flow regardless its\nsaddr/daddr could be transform by SA specified with configurable\nspi.\n\nSigned-off-by: Fan Du \u003cfan.du@windriver.com\u003e\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\n" }, { "commit": "619a60ee04be33238721a15c1f9704a2a515a33e", "tree": "15fe2a92ab11f78469be267d5e3b3c8e3d857a2d", "parents": [ "f3e3ccf83bab261c5b55623bd3e9d1147b1c2e19" ], "author": { "name": "Vlad Yasevich", "email": "vyasevich@gmail.com", "time": "Thu Jan 02 14:39:44 2014 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 02 17:22:48 2014 -0500" }, "message": "sctp: Remove outqueue empty state\n\nThe SCTP outqueue structure maintains a data chunks\nthat are pending transmission, the list of chunks that\nare pending a retransmission and a length of data in\nflight. It also tries to keep the emtpy state so that\nit can performe shutdown sequence or notify user.\n\nThe problem is that the empy state is inconsistently\ntracked. It is possible to completely drain the queue\nwithout sending anything when using PR-SCTP. In this\ncase, the empty state will not be correctly state as\nreport by Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e. This\ncan cause an association to be perminantly stuck in the\nSHUTDOWN_PENDING state.\n\nAdditionally, SCTP is incredibly inefficient when setting\nthe empty state. Even though all the data is availaible\nin the outqueue structure, we ignore it and walk a list\nof trasnports.\n\nIn the end, we can completely remove the extra empty\nstate and figure out if the queue is empty by looking\nat 3 things: length of pending data, length of in-flight\ndata, and exisiting of retransmit data. All of these\nare already in the strucutre.\n\nReported-by: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nSigned-off-by: Vlad Yasevich \u003cvyasevich@gmail.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nTested-by: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9c75f4029cf494ae810a54e34ede9803cff60c7c", "tree": "e2e6c4ead9ba8b736a9c78f2c918850f76e6befc", "parents": [ "2156d9a8ac0202f0158d407063cb850afffd3f56" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Tue Dec 31 11:54:00 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 02 03:30:36 2014 -0500" }, "message": "sched action: make local function static\n\nNo need to export functions only used in one file.\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nAcked-by: Jamal Hadi Salim \u003cjhs@mojatatu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0c3584d58913a72a6b28a976f7c0bfd2afb65237", "tree": "39a52c05caab356ff62d241de276c8dbfa855232", "parents": [ "b0555976973aa37f080188665aff2c55aa60f47d" ], "author": { "name": "Li RongQing", "email": "roy.qing.li@gmail.com", "time": "Fri Dec 27 16:32:38 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 02 03:30:35 2014 -0500" }, "message": "ipv6: remove prune parameter for fib6_clean_all\n\nsince the prune parameter for fib6_clean_all always is 0, remove it.\n\nSigned-off-by: Li RongQing \u003croy.qing.li@gmail.com\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e82435341ff08769b70400b72a7a8efda83c5014", "tree": "4216580642d3016d6d840753a402c7b8dee1a08d", "parents": [ "1d143d9f0c833fcf38cc737eb0a8698fa2dd144c" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Sun Dec 29 14:03:31 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 01 23:46:09 2014 -0500" }, "message": "ipv6: namespace cleanups\n\nRunning \u0027make namespacecheck\u0027 shows:\n net/ipv6/route.o\n ipv6_route_table_template\n rt6_bind_peer\n net/ipv6/icmp.o\n icmpv6_route_lookup\n ipv6_icmp_table_template\n\nThis addresses some of those warnings by:\n * make icmpv6_route_lookup static\n * move inline\u0027s out of ip6_route.h since only used into route.c\n * move rt6_bind_peer into route.c\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3678a9d86324e457d0ff9d898747ee7e787f4bb8", "tree": "a32a9a46e4e5f891b10a82fb53c03586fa2f164b", "parents": [ "47d1f71f56bd397bfa09c6b2a595991d1dd9c489" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Mon Dec 30 10:41:32 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 01 23:42:19 2014 -0500" }, "message": "netlink: cleanup rntl_af_register\n\nThe function __rtnl_af_register is never called outside this\ncode, and the return value is always 0.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e0309631ecf0cd16edba72ff74747fa1b96ead3", "tree": "fe37d9bc3d10e8a576e4d36418cf6c0e882588db", "parents": [ "f17e9fa5686ac21bce756638ef71160395880928" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Wed Jan 01 23:04:25 2014 +0100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 01 22:22:43 2014 -0500" }, "message": "net: llc: fix order of evaluation in llc_conn_ac_inc_vr_by_1\n\nFunction llc_conn_ac_inc_vr_by_1() evaluates via macro\nPDU_GET_NEXT_Vr() into ...\n\n llc_sk(sk)-\u003evR \u003d ++llc_sk(sk)-\u003evR \u0026 0xffffffffffffff7f\n\n... but the order in which the side effects take place is\nundefined because there is no intervening sequence point.\n\nAs llc_sk(sk)-\u003evR is written in llc_sk(sk)-\u003evR (assignment\nleft-hand side) and written in ++llc_sk(sk)-\u003evR \u0026 0xffffffffffffff7f\nthis might possibly yield undefined behavior.\n\nThe final value of llc_sk(sk)-\u003evR is ambiguous, because,\ndepending on the order of expression evaluation, the\nincrement may occur before, after, or interleaved with\nthe assignment. In C, evaluating such an expression yields\nundefined behavior.\n\nSince we\u0027re doing the increment via PDU_GET_NEXT_Vr() macro\nand the only place it is being used is from\nllc_conn_ac_inc_vr_by_1(), in order to increment vR by 1\nwith a follow-up optimized modulo, rewrite the expression\ninto ((vR + 1) \u0026 CONST) in order to fix this.\n\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@ghostprotocols.net\u003e\nCc: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad86c55bac643a745f480d26689d153ec0f38b04", "tree": "8ae3e20d2f3619021393166fe1f50a8ca00c1c33", "parents": [ "21eb218989523b7bee28900aaec9f9296b70fa27", "39731b78b4afebb7501c05b68e2443a1b250b41c" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 01 15:39:56 2014 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 01 15:39:56 2014 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n" }, { "commit": "c9d8ca0454a28d0f835138d7294ede4fc6d95572", "tree": "b70156265252cafb9541fecab7dbee7b0814713d", "parents": [ "0438816efd86c764d5544bf52e769604062316b3" ], "author": { "name": "Zhi Yong Wu", "email": "wuzhy@linux.vnet.ibm.com", "time": "Wed Jan 01 04:31:01 2014 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 31 15:59:27 2013 -0500" }, "message": "net, rps: fix build failure when CONFIG_RPS isn\u0027t set\n\nIn file included from net/socket.c:99:0:\ninclude/net/sock.h: In function ‘sock_rps_record_flow’:\ninclude/net/sock.h:849:30: error: ‘const struct sock’ has no member named ‘sk_rxhash’\ninclude/net/sock.h: In function ‘sock_rps_reset_flow’:\ninclude/net/sock.h:854:29: error: ‘const struct sock’ has no member named ‘sk_rxhash’\n\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Zhi Yong Wu \u003cwuzhy@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fe47755852d1f299b55a6e6594bb6e082ac103d4", "tree": "c7b7afa5b89a92f602ec9d278d4d8d78a84039c1", "parents": [ "84a6a0acad145fb9bc11dcb60f6d064072f0cc1c" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Sun Dec 22 18:54:31 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 31 13:31:34 2013 -0500" }, "message": "net: Allow setting sock flow hash without a sock\n\nThis patch adds sock_rps_record_flow_hash and sock_rps_reset_flow_hash\nwhich take a hash value as an argument and sets the sock_flow_table\naccordingly. This allows the table to be populated in cases where flow\nis being tracked outside of a sock structure.\n\nsock_rps_record_flow and sock_rps_reset_flow call this function\nwhere the hash is taken from sk_rxhash.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: Zhi Yong Wu \u003cwuzhy@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cc70d069e2b9cece683206c0f6a1d1484414e577", "tree": "be91bf60de5839a92b5f9edf9adb156b91e473a0", "parents": [ "5f291c2869a08a63dbdc9de3e13ac5f2d5ed8d47" ], "author": { "name": "Eric Leblond", "email": "eric@regit.org", "time": "Sun Dec 29 12:28:13 2013 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Mon Dec 30 15:04:41 2013 +0100" }, "message": "netfilter: REJECT: separate reusable code\n\nThis patch prepares the addition of TCP reset support in\nthe nft_reject module by moving reusable code into a header\nfile.\n\nSigned-off-by: Eric Leblond \u003ceric@regit.org\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "f7e56a76acf642d21a8e7bd587e270ae7addc4db", "tree": "8b0f96fd78a2c24e217b26e092004edcbc9261c2", "parents": [ "4ffa8fcd1732b5bb8cf961aa0e678953e637303d" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Sun Dec 29 11:39:51 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 29 16:34:24 2013 -0500" }, "message": "tcp: make local functions static\n\nThe following are only used in one file:\n tcp_connect_init\n tcp_set_rto\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea074b3495a023c2cf969605d51991b2b9df9514", "tree": "f79d1fe6a175cf470245f45791549233b813c698", "parents": [ "068a6e183484b1c619025da502a6fbfa53c50991" ], "author": { "name": "Stephen Hemminger", "email": "stephen@networkplumber.org", "time": "Sat Dec 28 11:11:42 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 28 17:05:45 2013 -0500" }, "message": "ipv4: ping make local stuff static\n\nDon\u0027t export ping_table or ping_v4_sendmsg. Both are only used\ninside ping code.\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "068a6e183484b1c619025da502a6fbfa53c50991", "tree": "30f23c55a7e6db1ab2e7b37d23596bc10629165b", "parents": [ "7195cf72211d77108de8271a247ec2876ae60502" ], "author": { "name": "Stephen Hemminger", "email": "stephen@networkplumber.org", "time": "Sat Dec 28 11:08:22 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 28 17:03:20 2013 -0500" }, "message": "ipv4: remove unused function\n\ninetpeer_invalidate_family defined but never used\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7195cf72211d77108de8271a247ec2876ae60502", "tree": "006f2366bd01cc341850d34656d4abd341d08ab7", "parents": [ "c9cb6b6ec18ca91d090178d3c6d1dde7428c791b" ], "author": { "name": "Stephen Hemminger", "email": "stephen@networkplumber.org", "time": "Sat Dec 28 11:07:18 2013 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Dec 28 17:02:46 2013 -0500" }, "message": "arp: make arp_invalidate static\n\nDon\u0027t export arp_invalidate, only used in arp.c\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b6835f9c5d3199e6fa17ffad023f4b7dbad4f1a3", "tree": "f38df1b7770514d2bf75fcd35ca6e6e4c02f5c54", "parents": [ "33ba4079ea8c611c1aeca34f2d6d53a8214c14c5" ], "author": { "name": "Rashika Kheria", "email": "rashika.kheria@gmail.com", "time": "Thu Dec 19 14:22:37 2013 +0530" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 19 18:51:20 2013 -0500" }, "message": "drivers: net: Include new header file in sbni.c\n\nCreate a new header file include/net/Space.h which contains\nprototype declaration of sbni_probe().\n\nInclude the new header file in drivers/net/Space.c and\ndrivers/net/wan/sbni.c because they use this function.\n\nThis eliminates the following warning in wan/sbni.c:\ndrivers/net/wan/sbni.c:224:12: warning: no previous prototype for ‘sbni_probe’ [-Wmissing-prototypes]\n\nSigned-off-by: Rashika Kheria \u003crashika.kheria@gmail.com\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1669cb9855050fe9d2a13391846f9aceccf42559", "tree": "80a2f1229902e9db7fd1552ee770372b351f2036", "parents": [ "cb4eae3d525abbe408e7e0efd7841b5c3c13cd0f", "b3c6efbc36e2c5ac820b1a800ac17cc3e040de0c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 19 18:37:49 2013 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 19 18:37:49 2013 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next\n\nSteffen Klassert says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\npull request (net-next): ipsec-next 2013-12-19\n\n1) Use the user supplied policy index instead of a generated one\n if present. From Fan Du.\n\n2) Make xfrm migration namespace aware. From Fan Du.\n\n3) Make the xfrm state and policy locks namespace aware. From Fan Du.\n\n4) Remove ancient sleeping when the SA is in acquire state,\n we now queue packets to the policy instead. This replaces the\n sleeping code.\n\n5) Remove FLOWI_FLAG_CAN_SLEEP. This was used to notify xfrm about the\n posibility to sleep. The sleeping code is gone, so remove it.\n\n6) Check user specified spi for IPComp. Thr spi for IPcomp is only\n 16 bit wide, so check for a valid value. From Fan Du.\n\n7) Export verify_userspi_info to check for valid user supplied spi ranges\n with pfkey and netlink. From Fan Du.\n\n8) RFC3173 states that if the total size of a compressed payload and the IPComp\n header is not smaller than the size of the original payload, the IP datagram\n must be sent in the original non-compressed form. These packets are dropped\n by the inbound policy check because they are not transformed. Document the need\n to set \u0027level use\u0027 for IPcomp to receive such packets anyway. From Fan Du.\n\nPlease pull or let me know if there are problems.\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa9ffc745610f31c6bc136d5a6a1782e00870e72", "tree": "adb2799c4d6a78a95d291582a02c42027b2527c2", "parents": [ "567ffc3509b2d3f965a49a18631d3da7f9a96d4f" ], "author": { "name": "Kyeyoon Park", "email": "kyeyoonp@qca.qualcomm.com", "time": "Mon Dec 16 23:01:30 2013 -0800" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Dec 19 16:29:22 2013 +0100" }, "message": "cfg80211: Add support for QoS mapping\n\nThis allows QoS mapping from external networks to be implemented as\ndefined in IEEE Std 802.11-2012, 10.24.9. APs can use this to advertise\nDSCP ranges and exceptions for mapping frames to a specific UP over\nWi-Fi.\n\nThe payload of the QoS Map Set element (IEEE Std 802.11-2012, 8.4.2.97)\nis sent to the driver through the new NL80211_ATTR_QOS_MAP attribute to\nconfigure the local behavior either on the AP (based on local\nconfiguration) or on a station (based on information received from the\nAP).\n\nSigned-off-by: Kyeyoon Park \u003ckyeyoonp@qca.qualcomm.com\u003e\nSigned-off-by: Jouni Malinen \u003cjouni@qca.qualcomm.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "567ffc3509b2d3f965a49a18631d3da7f9a96d4f", "tree": "844230d68e94ef86fb8958ed89676ff9349b11d0", "parents": [ "a7022e65c68ad89d6eb64f21aa4831c3822403d4" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Dec 18 14:43:31 2013 +0100" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Dec 19 13:40:31 2013 +0100" }, "message": "nl80211: support vendor-specific events\n\nIn addition to vendor-specific commands, also support vendor-specific\nevents. These must be registered with cfg80211 before they can be used.\nThey\u0027re also advertised in nl80211 in the wiphy information so that\nuserspace knows can be expected. The events themselves are sent on a\nnew multicast group called \"vendor\".\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "a7022e65c68ad89d6eb64f21aa4831c3822403d4", "tree": "7f00a23cf59d36eac93e99435d78adf486a0d242", "parents": [ "34a3740d6b392896b71e36cd5cd68837a8f94a5c" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Mon Dec 16 21:49:14 2013 +0100" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Dec 19 13:37:46 2013 +0100" }, "message": "mac80211: add helper functions for tracking P2P NoA state\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" } ], "next": "93b36cf3425b9bd9c56df7680fb237686b9c82ae" }