)]}' { "log": [ { "commit": "bbda1baeeb2f4aff3addac3d086a1e56c3f2503e", "tree": "aca955046da89c24f612e8c7ee177ef6bf6efbd5", "parents": [ "2b76db6a0f649f5a54805807d36d51b6e9e49089", "f3ad857e3da1abaea780dc892b592cd86c541c52" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 11 14:33:16 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 11 14:33:16 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nPull networking fixes from David Miller:\n\n 1) Brown paper bag fix in HTB scheduler, class options set incorrectly\n due to a typoe. Fix from Vimalkumar.\n\n 2) It\u0027s possible for the ipv6 FIB garbage collector to run before all\n the necessary datastructure are setup during init, defer the\n notifier registry to avoid this problem. Fix from Michal Kubecek.\n\n 3) New i40e ethernet driver from the Intel folks.\n\n 4) Add new qmi wwan device IDs, from Bjørn Mork.\n\n 5) Doorbell lock in bnx2x driver is not initialized properly in some\n configurations, fix from Ariel Elior.\n\n 6) Revert an ipv6 packet option padding change that broke standardized\n ipv6 implementation test suites. From Jiri Pirko.\n\n 7) Fix synchronization of ARP information in bonding layer, from\n Nikolay Aleksandrov.\n\n 8) Fix missing error return resulting in illegal memory accesses in\n openvswitch, from Daniel Borkmann.\n\n 9) SCTP doesn\u0027t signal poll events properly due to mistaken operator\n precedence, fix also from Daniel Borkmann.\n\n10) __netdev_pick_tx() passes wrong index to sk_tx_queue_set() which\n essentially disables caching of TX queue in sockets :-/ Fix from\n Eric Dumazet.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)\n net_sched: htb: fix a typo in htb_change_class()\n net: qmi_wwan: add new Qualcomm devices\n ipv6: don\u0027t call fib6_run_gc() until routing is ready\n net: tilegx driver: avoid compiler warning\n fib6_rules: fix indentation\n irda: vlsi_ir: Remove casting the return value which is a void pointer\n irda: donauboe: Remove casting the return value which is a void pointer\n net: fix multiqueue selection\n net: sctp: fix smatch warning in sctp_send_asconf_del_ip\n net: sctp: fix bug in sctp_poll for SOCK_SELECT_ERR_QUEUE\n net: fib: fib6_add: fix potential NULL pointer dereference\n net: ovs: flow: fix potential illegal memory access in __parse_flow_nlattrs\n bcm63xx_enet: remove deprecated IRQF_DISABLED\n net: korina: remove deprecated IRQF_DISABLED\n macvlan: Move skb_clone check closer to call\n qlcnic: Fix warning reported by kbuild test robot.\n bonding: fix bond_arp_rcv setting and arp validate desync state\n bonding: fix store_arp_validate race with mode change\n ipv6/exthdrs: accept tlv which includes only padding\n bnx2x: avoid atomic allocations during initialization\n ...\n" }, { "commit": "2c861cc65ef4604011a0082e4dcdba2819aa191a", "tree": "d6fe5436cf4d492c727cfb370232c87254d72097", "parents": [ "444fa88ac35aa1bf9b7c23945444bc67f631033b" ], "author": { "name": "Michal Kubeček", "email": "mkubecek@suse.cz", "time": "Mon Sep 09 21:45:04 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 11 17:04:09 2013 -0400" }, "message": "ipv6: don\u0027t call fib6_run_gc() until routing is ready\n\nWhen loading the ipv6 module, ndisc_init() is called before\nip6_route_init(). As the former registers a handler calling\nfib6_run_gc(), this opens a window to run the garbage collector\nbefore necessary data structures are initialized. If a network\ndevice is initialized in this window, adding MAC address to it\ntriggers a NETDEV_CHANGEADDR event, leading to a crash in\nfib6_clean_all().\n\nTake the event handler registration out of ndisc_init() into a\nseparate function ndisc_late_init() and move it after\nip6_route_init().\n\nSigned-off-by: Michal Kubecek \u003cmkubecek@suse.cz\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2b76db6a0f649f5a54805807d36d51b6e9e49089", "tree": "1155e363d3ea5e416ac5627402dd862028db6907", "parents": [ "53bf710832a7191e023e2bb1e333226e3115cfa0", "50192abe02929586111fb33f216060a9341875f1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 11 12:34:13 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 11 12:34:13 2013 -0700" }, "message": "Merge tag \u0027for-linus-3.12-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs\n\nPull 9p updates from Eric Van Hensbergen:\n \"Minor 9p fixes and tweaks for 3.12 merge window\n\n The first fixes namespace issues which causes a kernel NULL pointer\n dereference, the second fixes uevent handling to work better with\n udev, and the third switches some code to use srlcpy instead of\n strncpy in order to be safer.\n\n All changes have been baking in for-next for at least 2 weeks\"\n\n* tag \u0027for-linus-3.12-merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:\n fs/9p: avoid accessing utsname after namespace has been torn down\n 9p: send uevent after adding/removing mount_tag attribute\n fs: 9p: use strlcpy instead of strncpy\n" }, { "commit": "cc998ff8811530be521f6b316f37ab7676a07938", "tree": "a054b3bf4b2ef406bf756a6cfc9be2f9115f17ae", "parents": [ "57d730924d5cc2c3e280af16a9306587c3a511db", "0d40f75bdab241868c0eb6f97aef9f8b3a66f7b3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 05 14:54:29 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 05 14:54:29 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking changes from David Miller:\n \"Noteworthy changes this time around:\n\n 1) Multicast rejoin support for team driver, from Jiri Pirko.\n\n 2) Centralize and simplify TCP RTT measurement handling in order to\n reduce the impact of bad RTO seeding from SYN/ACKs. Also, when\n both timestamps and local RTT measurements are available prefer\n the later because there are broken middleware devices which\n scramble the timestamp.\n\n From Yuchung Cheng.\n\n 3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel\n memory consumed to queue up unsend user data. From Eric Dumazet.\n\n 4) Add a \"physical port ID\" abstraction for network devices, from\n Jiri Pirko.\n\n 5) Add a \"suppress\" operation to influence fib_rules lookups, from\n Stefan Tomanek.\n\n 6) Add a networking development FAQ, from Paul Gortmaker.\n\n 7) Extend the information provided by tcp_probe and add ipv6 support,\n from Daniel Borkmann.\n\n 8) Use RCU locking more extensively in openvswitch data paths, from\n Pravin B Shelar.\n\n 9) Add SCTP support to openvswitch, from Joe Stringer.\n\n 10) Add EF10 chip support to SFC driver, from Ben Hutchings.\n\n 11) Add new SYNPROXY netfilter target, from Patrick McHardy.\n\n 12) Compute a rate approximation for sending in TCP sockets, and use\n this to more intelligently coalesce TSO frames. Furthermore, add\n a new packet scheduler which takes advantage of this estimate when\n available. From Eric Dumazet.\n\n 13) Allow AF_PACKET fanouts with random selection, from Daniel\n Borkmann.\n\n 14) Add ipv6 support to vxlan driver, from Cong Wang\"\n\nResolved conflicts as per discussion.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits)\n openvswitch: Fix alignment of struct sw_flow_key.\n netfilter: Fix build errors with xt_socket.c\n tcp: Add missing braces to do_tcp_setsockopt\n caif: Add missing braces to multiline if in cfctrl_linkup_request\n bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize\n vxlan: Fix kernel panic on device delete.\n net: mvneta: implement -\u003endo_do_ioctl() to support PHY ioctls\n net: mvneta: properly disable HW PHY polling and ensure adjust_link() works\n icplus: Use netif_running to determine device state\n ethernet/arc/arc_emac: Fix huge delays in large file copies\n tuntap: orphan frags before trying to set tx timestamp\n tuntap: purge socket error queue on detach\n qlcnic: use standard NAPI weights\n ipv6:introduce function to find route for redirect\n bnx2x: VF RSS support - VF side\n bnx2x: VF RSS support - PF side\n vxlan: Notify drivers for listening UDP port changes\n net: usbnet: update addr_assign_type if appropriate\n driver/net: enic: update enic maintainers and driver\n driver/net: enic: Exposing symbols for Cisco\u0027s low latency driver\n ...\n" }, { "commit": "06c54055bebf919249aa1eb68312887c3cfe77b4", "tree": "223a49c09e5d26516ed0161b8a52d08454ae028e", "parents": [ "1a5bbfc3d6b700178b75743a2ba1fd2e58a8f36f", "e2e5c4c07caf810d7849658dca42f598b3938e21" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 05 14:58:52 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 05 14:58:52 2013 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/ethernet/stmicro/stmmac/stmmac_platform.c\n\tnet/bridge/br_multicast.c\n\tnet/ipv6/sit.c\n\nThe conflicts were minor:\n\n1) sit.c changes overlap with change to ip_tunnel_xmit() signature.\n\n2) br_multicast.c had an overlap between computing max_delay using\n msecs_to_jiffies and turning MLDV2_MRC() into an inline function\n with a name using lowercase instead of uppercase letters.\n\n3) stmmac had two overlapping changes, one which conditionally allocated\n and hooked up a dma_cfg based upon the presence of the pbl OF property,\n and another one handling store-and-forward DMA made. The latter of\n which should not go into the new of_find_property() basic block.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "53cf527513eed6e7170e9dceacd198f9267171b0", "tree": "a3492c0373949048084213dc4bd02efd130aa5cf", "parents": [ "eef23b53985f8e08256f24d76e576d69fb0d44d3" ], "author": { "name": "Joseph Gasparakis", "email": "joseph.gasparakis@intel.com", "time": "Wed Sep 04 02:13:38 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 05 12:44:30 2013 -0400" }, "message": "vxlan: Notify drivers for listening UDP port changes\n\nThis patch adds two more ndo ops: ndo_add_rx_vxlan_port() and\nndo_del_rx_vxlan_port().\n\nDrivers can get notifications through the above functions about changes\nof the UDP listening port of VXLAN. Also, when physical ports come up,\nnow they can call vxlan_get_rx_port() in order to obtain the port number(s)\nof the existing VXLAN interface in case they already up before them.\n\nThis information about the listening UDP port would be used for VXLAN\nrelated offloads.\n\nA big thank you to John Fastabend (john.r.fastabend@intel.com) for his\ninput and his suggestions on this patch set.\n\nCC: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nCC: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: Joseph Gasparakis \u003cjoseph.gasparakis@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e3f5b17047dec4acd8957dad053e70d87f18d97e", "tree": "d7386719180cff0e7ab8c98cc530c5ac7ec7c62a", "parents": [ "6c567b78c8a7da26e5e6f5bd458882ad9967233a" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Wed Sep 04 00:19:39 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 04 14:53:20 2013 -0400" }, "message": "net: ipv6: mld: get rid of MLDV2_MRC and simplify calculation\n\nGet rid of MLDV2_MRC and use our new macros for mantisse and\nexponent to calculate Maximum Response Delay out of the Maximum\nResponse Code.\n\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nCc: 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": "89225d1ce6af3916bf32aecbe9d83f571a098588", "tree": "0c4c921e137a42d6d2e6c65d3879fd33bbc2702b", "parents": [ "52f20e655d9f6f7f937a1cdacf219d9df3ab6166" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Wed Sep 04 00:19:37 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 04 14:53:20 2013 -0400" }, "message": "net: ipv6: mld: fix v1/v2 switchback timeout to rfc3810, 9.12.\n\ni) RFC3810, 9.2. Query Interval [QI] says:\n\n The Query Interval variable denotes the interval between General\n Queries sent by the Querier. Default value: 125 seconds. [...]\n\nii) RFC3810, 9.3. Query Response Interval [QRI] says:\n\n The Maximum Response Delay used to calculate the Maximum Response\n Code inserted into the periodic General Queries. Default value:\n 10000 (10 seconds) [...] The number of seconds represented by the\n [Query Response Interval] must be less than the [Query Interval].\n\niii) RFC3810, 9.12. Older Version Querier Present Timeout [OVQPT] says:\n\n The Older Version Querier Present Timeout is the time-out for\n transitioning a host back to MLDv2 Host Compatibility Mode. When an\n MLDv1 query is received, MLDv2 hosts set their Older Version Querier\n Present Timer to [Older Version Querier Present Timeout].\n\n This value MUST be ([Robustness Variable] times (the [Query Interval]\n in the last Query received)) plus ([Query Response Interval]).\n\nHence, on *default* the timeout results in:\n\n [RV] \u003d 2, [QI] \u003d 125sec, [QRI] \u003d 10sec\n [OVQPT] \u003d [RV] * [QI] + [QRI] \u003d 260sec\n\nHaving that said, we currently calculate [OVQPT] (here given as \u0027switchback\u0027\nvariable) as ...\n\n switchback \u003d (idev-\u003emc_qrv + 1) * max_delay\n\nRFC3810, 9.12. says \"the [Query Interval] in the last Query received\". In\nsection \"9.14. Configuring timers\", it is said:\n\n This section is meant to provide advice to network administrators on\n how to tune these settings to their network. Ambitious router\n implementations might tune these settings dynamically based upon\n changing characteristics of the network. [...]\n\niv) RFC38010, 9.14.2. Query Interval:\n\n The overall level of periodic MLD traffic is inversely proportional\n to the Query Interval. A longer Query Interval results in a lower\n overall level of MLD traffic. The value of the Query Interval MUST\n be equal to or greater than the Maximum Response Delay used to\n calculate the Maximum Response Code inserted in General Query\n messages.\n\nI assume that was why switchback is calculated as is (3 * max_delay), although\nthis setting seems to be meant for routers only to configure their [QI]\ninterval for non-default intervals. So usage here like this is clearly wrong.\n\nConcluding, the current behaviour in IPv6\u0027s multicast code is not conform\nto the RFC as switch back is calculated wrongly. That is, it has a too small\nvalue, so MLDv2 hosts switch back again to MLDv2 way too early, i.e. ~30secs\ninstead of ~260secs on default.\n\nHence, introduce necessary helper functions and fix this up properly as it\nshould be.\n\nIntroduced in 06da92283 (\"[IPV6]: Add MLDv2 support.\"). Credits to Hannes\nFrederic Sowa who also had a hand in this as well. Also thanks to Hangbin Liu\nwho did initial testing.\n\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nCc: David Stevens \u003cdlstevens@us.ibm.com\u003e\nCc: 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": "c995ae2259ee36caf48bbfacf40111998dacd4af", "tree": "dbe9be79766ab1c2a4f9da7ae461bd6ceab6bc9f", "parents": [ "cc8c6c1b21c9b1e0f1e89428c07c7c52435cba0c" ], "author": { "name": "Vijay Subramanian", "email": "subramanian.vijay@gmail.com", "time": "Tue Sep 03 12:23:22 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 04 00:27:28 2013 -0400" }, "message": "tcp: Change return value of tcp_rcv_established()\n\ntcp_rcv_established() returns only one value namely 0. We change the return\nvalue to void (as suggested by David Miller).\n\nAfter commit 0c24604b (tcp: implement RFC 5961 4.2), we no longer send RSTs in\nresponse to SYNs. We can remove the check and processing on the return value of\ntcp_rcv_established().\n\nWe also fix jtcp_rcv_established() in tcp_probe.c to match that of\ntcp_rcv_established().\n\nSigned-off-by: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea23192e8e577dfc51e0f4fc5ca113af334edff9", "tree": "3568561a6128c5395dc0cf1b0f105e313d848d9b", "parents": [ "963a88b31ddbbe99f38502239b1a46601773d217" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Sep 02 15:34:58 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 04 00:27:26 2013 -0400" }, "message": "tunnels: harmonize cleanup done on skb on rx path\n\nThe goal of this patch is to harmonize cleanup done on a skbuff on rx path.\nBefore this patch, behaviors were different depending of the tunnel type.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "963a88b31ddbbe99f38502239b1a46601773d217", "tree": "9c07bbee7240db69d82d2152b7e47013012c739b", "parents": [ "8b27f27797cac5ed9b2f3e63dac89a7ae70e70a7" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Sep 02 15:34:57 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 04 00:27:25 2013 -0400" }, "message": "tunnels: harmonize cleanup done on skb on xmit path\n\nThe goal of this patch is to harmonize cleanup done on a skbuff on xmit path.\nBefore this patch, behaviors were different depending of the tunnel type.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "117961878cc1386923cfddcdd9016b777827c8dd", "tree": "7ba6cf5d0384a7fc626dbb99850f8ad6f4cb1cd6", "parents": [ "8b7ed2d91d6afb0b55ba75f94b66e51f70783a46" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Sep 02 15:34:55 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 04 00:27:25 2013 -0400" }, "message": "vxlan: remove net arg from vxlan[6]_xmit_skb()\n\nThis argument is not used, let\u0027s remove it.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b7ed2d91d6afb0b55ba75f94b66e51f70783a46", "tree": "7bd59ac4b18e8d98dc4a215d20024fdabae713bd", "parents": [ "c48268611a3df84a9250d2fc34ad671cdae43440" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Mon Sep 02 15:34:54 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 04 00:27:25 2013 -0400" }, "message": "iptunnels: remove net arg from iptunnel_xmit()\n\nThis argument is not used, let\u0027s remove it.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "951fd874c3b014c4abf38a8e588d4687b98fedb4", "tree": "e9a6215e7a00efe671471b3f8d6bf180572f5e0b", "parents": [ "7367d0b573d149550d2ae25c402984b98f8f422e" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Sep 01 13:11:55 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 03 22:34:47 2013 -0400" }, "message": "llc: Use normal etherdevice.h tests\n\nConvert the llc_\u003cfoo\u003e static inlines to the\nequivalents from etherdevice.h and remove\nthe llc_\u003cfoo\u003e static inline functions.\n\nllc_mac_null -\u003e is_zero_ether_addr\nllc_mac_multicast -\u003e is_multicast_ether_addr\nllc_mac_match -\u003e ether_addr_equal\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e7abfe40928f4f8c1aa908477c36c13843bd1a57", "tree": "968d10a574b9de702b1c79345ae44afd5c404462", "parents": [ "b1b72076b90d631637497b35e36bc64254df199d", "0d8165e9fca119b804de2cf35674e07c36c9704f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 03 21:45:31 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 03 21:45:31 2013 -0400" }, "message": "Merge branch \u0027for-davem\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next\n\nJohn W. Linville says:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\nPlease accept this batch of updates intended for the 3.12 stream.\n\nFor the mac80211 bits, Johannes says this:\n\n\"This time I have various improvements all over the place: IBSS, mesh,\ntestmode, AP client powersave handling, one of the rare rfkill patches\nand some code cleanup.\"\n\nAlso for mac80211:\n\n\"And I also have some more changes for -next, just a few small fixes and\nimprovements, nothing really stands out.\"\n\nAnd for iwlwifi:\n\n\"This time I have some powersave work (notably uAPSD support), CQM\noffloads, support for a new firmware API and various code cleanups.\"\n\nRegarding the Bluetooth bits, Gustavo says:\n\n\"Patches to 3.12, here we have:\n\n* implementation of a proper tty_port for RFCOMM devices, this fixes some\nissues people were seeing lately in the kernel.\n* Add voice_setting option for SCO, it is used for SCO Codec selection\n* bugfixes, small improvements and clean ups\"\n\nFor the NFC bits, Samuel says:\n\n\"With this one we have:\n\n- A few pn533 improvements and minor fixes. Testing our pn533 driver\n against Google\u0027s NCI stack triggered a few issues that we fixed now.\n We also added Tx fragmentation support to this driver.\n\n- More NFC secure element handling. We added a GET_SE netlink command\n for getting all the discovered secure elements, and we defined 2\n additional secure element netlink event (transaction and connectivity).\n We also fixed a couple of typos and copy-paste bugs from the secure\n element handling code.\n\n- Firmware download support for the pn544 driver. This chipset can enter a\n special mode where it\u0027s waiting for firmware blobs to replace the\n already flashed one. We now support that mode.\"\n\nWith repect to the ath tree, Kalle says:\n\n\"New features in ath10k are rx/tx checsumming in hw and survey scan\nimplemented by Michal. Also he made fixes to different areas of the\ndriver, most notable being fixing the case when using two streams and\nreducing the number of interface combinations to avoid firmware crashes.\nBartosz did a clean related to how we handle SoC power save in PCI\nlayer.\n\nFor ath6kl Mohammed and Vasanth sent each a patch to fix two infrequent\ncrashes.\"\n\nI also pulled the wireless tree into wireless-next to support a\nrequest from Johannes. On top of all that, there are the usual\nsort of driver updates. The mwifiex, brcmfmac, brcmsmac, ath9k,\nand rt2x00 drivers all get some attention, as does the bcma bus and\na few other random bits here and there.\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": "32dad03d164206ea886885d0740284ba215b0970", "tree": "5fd89fe27295bfbe47dce5f274aa645099741a71", "parents": [ "357397a14117f0c2eeafcac06a1f8412a02aa6af", "d1625964da51bda61306ad3ec45307a799c21f08" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 03 18:25:03 2013 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 03 18:25:03 2013 -0700" }, "message": "Merge branch \u0027for-3.12\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup updates from Tejun Heo:\n \"A lot of activities on the cgroup front. Most changes aren\u0027t visible\n to userland at all at this point and are laying foundation for the\n planned unified hierarchy.\n\n - The biggest change is decoupling the lifetime management of css\n (cgroup_subsys_state) from that of cgroup\u0027s. Because controllers\n (cpu, memory, block and so on) will need to be dynamically enabled\n and disabled, css which is the association point between a cgroup\n and a controller may come and go dynamically across the lifetime of\n a cgroup. Till now, css\u0027s were created when the associated cgroup\n was created and stayed till the cgroup got destroyed.\n\n Assumptions around this tight coupling permeated through cgroup\n core and controllers. These assumptions are gradually removed,\n which consists bulk of patches, and css destruction path is\n completely decoupled from cgroup destruction path. Note that\n decoupling of creation path is relatively easy on top of these\n changes and the patchset is pending for the next window.\n\n - cgroup has its own event mechanism cgroup.event_control, which is\n only used by memcg. It is overly complex trying to achieve high\n flexibility whose benefits seem dubious at best. Going forward,\n new events will simply generate file modified event and the\n existing mechanism is being made specific to memcg. This pull\n request contains prepatory patches for such change.\n\n - Various fixes and cleanups\"\n\nFixed up conflict in kernel/cgroup.c as per Tejun.\n\n* \u0027for-3.12\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (69 commits)\n cgroup: fix cgroup_css() invocation in css_from_id()\n cgroup: make cgroup_write_event_control() use css_from_dir() instead of __d_cgrp()\n cgroup: make cgroup_event hold onto cgroup_subsys_state instead of cgroup\n cgroup: implement CFTYPE_NO_PREFIX\n cgroup: make cgroup_css() take cgroup_subsys * instead and allow NULL subsys\n cgroup: rename cgroup_css_from_dir() to css_from_dir() and update its syntax\n cgroup: fix cgroup_write_event_control()\n cgroup: fix subsystem file accesses on the root cgroup\n cgroup: change cgroup_from_id() to css_from_id()\n cgroup: use css_get() in cgroup_create() to check CSS_ROOT\n cpuset: remove an unncessary forward declaration\n cgroup: RCU protect each cgroup_subsys_state release\n cgroup: move subsys file removal to kill_css()\n cgroup: factor out kill_css()\n cgroup: decouple cgroup_subsys_state destruction from cgroup destruction\n cgroup: replace cgroup-\u003ecss_kill_cnt with -\u003enr_css\n cgroup: bounce cgroup_subsys_state ref kill confirmation to a work item\n cgroup: move cgroup-\u003esubsys[] assignment to online_css()\n cgroup: reorganize css init / exit paths\n cgroup: add __rcu modifier to cgroup-\u003esubsys[]\n ...\n" }, { "commit": "5a17a390de7bdbcfff9b8f344273a886ca4cf8bf", "tree": "9e5d0a9ab50d7700b8a92b6cce9094148f4043a1", "parents": [ "660d98cae0a474887bb5d66e60422addb4c6532c" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Mon Sep 02 10:06:53 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 02 21:00:50 2013 -0700" }, "message": "net: make snmp_mib_free static inline\n\nFengguang reported:\n\n net/built-in.o: In function `in6_dev_finish_destroy\u0027:\n (.text+0x4ca7d): undefined reference to `snmp_mib_free\u0027\n\nthis is due to snmp_mib_free() is defined when CONFIG_INET is enabled,\nbut in6_dev_finish_destroy() is now moved to core kernel.\n\nI think snmp_mib_free() is small enough to be inlined, so just make it\nstatic inline.\n\nReported-by: kbuild test robot \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f564f45c451809aa3b74f577754528520d315ac1", "tree": "6bebdf8d9a149b4d370a5f43ccd86935adbbc273", "parents": [ "f39dc1023d6b9933528638a0c2dd618b4fdf664e" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Sat Aug 31 13:44:36 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 31 22:30:01 2013 -0400" }, "message": "vxlan: add ipv6 proxy support\n\nThis patch adds the IPv6 version of \"arp_reduce\", ndisc_send_na()\nwill be needed.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: David Stevens \u003cdlstevens@us.ibm.com\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e15a00aafa4b7953ad717d3cb1ad7acf4ff76945", "tree": "7acce1d228f31755cac9b9d10d8574b48eb89123", "parents": [ "e4c7ed415387cf718ffbec305396c30cee092987" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Sat Aug 31 13:44:34 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 31 22:30:00 2013 -0400" }, "message": "vxlan: add ipv6 route short circuit support\n\nroute short circuit only has IPv4 part, this patch adds\nthe IPv6 part. nd_tbl will be needed.\n\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: David Stevens \u003cdlstevens@us.ibm.com\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e4c7ed415387cf718ffbec305396c30cee092987", "tree": "a484f436d61c6d716eca3f041cbbe8afc04c1c19", "parents": [ "caf92bc4007036cfac8ee06c845fdfe6496e4fb3" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Sat Aug 31 13:44:33 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 31 22:30:00 2013 -0400" }, "message": "vxlan: add ipv6 support\n\nThis patch adds IPv6 support to vxlan device, as the new version\nRFC already mentions it:\n\n http://tools.ietf.org/html/draft-mahalingam-dutt-dcops-vxlan-03\n\nCc: David Stevens \u003cdlstevens@us.ibm.com\u003e\nCc: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5f81bd2e5d804ca93f3ec8873451b22d2f454721", "tree": "1c04d4577a3cd91af28753d97c7d6919dc0fcdef", "parents": [ "788787b55913d456b9851d926d9a80ff00892c34" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Sat Aug 31 13:44:30 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 31 22:30:00 2013 -0400" }, "message": "ipv6: export a stub for IPv6 symbols used by vxlan\n\nIn case IPv6 is compiled as a module, introduce a stub\nfor ipv6_sock_mc_join and ipv6_sock_mc_drop etc.. It will be used\nby vxlan module. Suggested by Ben.\n\nThis is an ugly but easy solution for now.\n\nCc: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nCc: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3ce9b35ff6de8dfebb0b0045e667c000f632e563", "tree": "ecde35b0c857ba52ef90724bf12f037f52ab4957", "parents": [ "ae5dbf1ad83cb90921a400d15fb18afae66e1e56" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Sat Aug 31 13:44:28 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 31 22:29:59 2013 -0400" }, "message": "ipv6: move ip6_dst_hoplimit() into core kernel\n\nIt will be used by vxlan, and may not be inlined.\n\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d2a7f269f91299b8e5f6c7d2a41ba46248d73d24", "tree": "91016a49e4e244f1f13ec067f816e6166801b70f", "parents": [ "6da7c8fcbcbdb50ec68c61b40d554c74850fdb91" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Sat Aug 31 10:15:50 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 31 18:09:45 2013 -0400" }, "message": "qdisc: make args to qdisc_create_default const\n\nFixes warnings introduced by the qdisc default patch.\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6da7c8fcbcbdb50ec68c61b40d554c74850fdb91", "tree": "587e811df17b158e2c83ca3333d2a6c4c21797ef", "parents": [ "7d7628f3719e85e41d3948759ef969707036033d" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Tue Aug 27 16:19:08 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 31 00:32:32 2013 -0400" }, "message": "qdisc: allow setting default queuing discipline\n\nBy default, the pfifo_fast queue discipline has been used by default\nfor all devices. But we have better choices now.\n\nThis patch allow setting the default queueing discipline with sysctl.\nThis allows easy use of better queueing disciplines on all devices\nwithout having to use tc qdisc scripts. It is intended to allow\nan easy path for distributions to make fq_codel or sfq the default\nqdisc.\n\nThis patch also makes pfifo_fast more of a first class qdisc, since\nit is now possible to manually override the default and explicitly\nuse pfifo_fast. The behavior for systems who do not use the sysctl\nis unchanged, they still get pfifo_fast\n\nAlso removes leftover random # in sysctl net core.\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "79f9ab7e0a8ec452e58b5a5267b9eb019ff493d0", "tree": "650d432ab57882fa022b0edaee058fe8044e68c0", "parents": [ "1f324e38870cc09659cf23bc626f1b8869e201f2", "302a50bc941010d7a67f288fd0db31981e4d722d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 29 16:05:30 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 29 16:05:30 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec\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 fixes some issues that arise when 6in4 or 4in6 tunnels\nare used in combination with IPsec, all from Hannes Frederic Sowa and a\nnull pointer dereference when queueing packets to the policy hold queue.\n\n1) We might access the local error handler of the wrong address family if\n 6in4 or 4in6 tunnel is protected by ipsec. Fix this by addind a pointer\n to the correct local_error to xfrm_state_afinet.\n\n2) Add a helper function to always refer to the correct interpretation\n of skb-\u003esk.\n\n3) Call skb_reset_inner_headers to record the position of the inner headers\n when adding a new one in various ipv6 tunnels. This is needed to identify\n the addresses where to send back errors in the xfrm layer.\n\n4) Dereference inner ipv6 header if encapsulated to always call the\n right error handler.\n\n5) Choose protocol family by skb protocol to not call the wrong\n xfrm{4,6}_local_error handler in case an ipv6 sockets is used\n in ipv4 mode.\n\n6) Partly revert \"xfrm: introduce helper for safe determination of mtu\"\n because this introduced pmtu discovery problems.\n\n7) Set skb-\u003eprotocol on tcp, raw and ip6_append_data genereated skbs.\n We need this to get the correct mtu informations in xfrm.\n\n8) Fix null pointer dereference in xdst_queue_output.\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": "95bd09eb27507691520d39ee1044d6ad831c1168", "tree": "e05045cc6418ce08aa87d5f8c17366a7fa672f3c", "parents": [ "b800c3b966bcf004bd8592293a49ed5cb7ea67a9" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Tue Aug 27 05:46:32 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 29 15:50:06 2013 -0400" }, "message": "tcp: TSO packets automatic sizing\n\nAfter hearing many people over past years complaining against TSO being\nbursty or even buggy, we are proud to present automatic sizing of TSO\npackets.\n\nOne part of the problem is that tcp_tso_should_defer() uses an heuristic\nrelying on upcoming ACKS instead of a timer, but more generally, having\nbig TSO packets makes little sense for low rates, as it tends to create\nmicro bursts on the network, and general consensus is to reduce the\nbuffering amount.\n\nThis patch introduces a per socket sk_pacing_rate, that approximates\nthe current sending rate, and allows us to size the TSO packets so\nthat we try to send one packet every ms.\n\nThis field could be set by other transports.\n\nPatch has no impact for high speed flows, where having large TSO packets\nmakes sense to reach line rate.\n\nFor other flows, this helps better packet scheduling and ACK clocking.\n\nThis patch increases performance of TCP flows in lossy environments.\n\nA new sysctl (tcp_min_tso_segs) is added, to specify the\nminimal size of a TSO packet (default being 2).\n\nA follow-up patch will provide a new packet scheduler (FQ), using\nsk_pacing_rate as an input to perform optional per flow pacing.\n\nThis explains why we chose to set sk_pacing_rate to twice the current\nrate, allowing \u0027slow start\u0027 ramp up.\n\nsk_pacing_rate \u003d 2 * cwnd * mss / srtt\n\nv2: Neal Cardwell reported a suspect deferring of last two segments on\ninitial write of 10 MSS, I had to change tcp_tso_should_defer() to take\ninto account tp-\u003exmit_size_goal_segs\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Yuchung Cheng \u003cycheng@google.com\u003e\nCc: Van Jacobson \u003cvanj@google.com\u003e\nCc: Tom Herbert \u003ctherbert@google.com\u003e\nAcked-by: Yuchung Cheng \u003cycheng@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "76bfd8984430be5b19727d09f6ab5e1d7a247f8c", "tree": "a41d90d3aa24724ada4945fca3085dfeab9bef4b", "parents": [ "03536cc3ad611f29a35803d37a44414b823135c3" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Mon Aug 26 16:34:00 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 29 14:55:54 2013 -0400" }, "message": "net: sctp: reorder sctp_globals to reduce cacheline usage\n\nReduce cacheline usage from 2 to 1 cacheline for sctp_globals structure. By\nreordering elements, we can close gaps and simply achieve the following:\n\nCurrent situation:\n /* size: 80, cachelines: 2, members: 10 */\n /* sum members: 57, holes: 4, sum holes: 16 */\n /* padding: 7 */\n /* last cacheline: 16 bytes */\n\nAfterwards:\n /* size: 64, cachelines: 1, members: 10 */\n /* padding: 7 */\n\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0d8165e9fca119b804de2cf35674e07c36c9704f", "tree": "3d66d027b502b6fdb98666a9121c7f52b48c657d", "parents": [ "4c9d546f6c522f541dfb01e192ab7101eca0053b", "076f0d20b636ef0e701e21e701c0631b5757b732" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 29 14:08:24 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 29 14:08:24 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/pcie/trans.c\n" }, { "commit": "3046e2f5b79a86044ac0a29c69610d6ac6a4b882", "tree": "92148960b1400fb5e5c30192530103f5cddd82d0", "parents": [ "64c3b252e9fc8256ef7b1b99ba60492163cd06e8" ], "author": { "name": "Eliezer Tamir", "email": "eliezer.tamir@linux.intel.com", "time": "Sun Aug 25 10:23:46 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 28 17:45:48 2013 -0400" }, "message": "net: add cpu_relax to busy poll loop\n\nAdd a cpu_relaxt to sk_busy_loop.\n\nJulie Cummings reported performance issues when hyperthreading is on.\nArjan van de Ven observed that we should have a cpu_relax() in the\nbusy poll loop.\n\nReported-by: Julie Cummings \u003cjulie.a.cummings@intel.com\u003e\nSigned-off-by: Eliezer Tamir \u003celiezer.tamir@linux.intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "33c6b1f6b154894321f5734e50c66621e9134e7e", "tree": "b064251e8081c3dba7115b44ea6db15d240e1204", "parents": [ "9b96309c5b0b9e466773c07a5bc8b7b68fcf010a" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Fri Aug 23 12:45:04 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 28 17:19:17 2013 -0400" }, "message": "genl: Hold reference on correct module while netlink-dump.\n\nnetlink dump operations take module as parameter to hold\nreference for entire netlink dump duration.\nCurrently it holds ref only on genl module which is not correct\nwhen we use ops registered to genl from another module.\nFollowing patch adds module pointer to genl_ops so that netlink\ncan hold ref count on it.\n\nCC: Jesse Gross \u003cjesse@nicira.com\u003e\nCC: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3e979a52c554f45e4ca6f01ca6933acef34b872", "tree": "53aa9e61aa7fd0c225528fba4144b2d15f709ad9", "parents": [ "cd80e107b741f9e05c53a01e5cbe2cdf4b6074bc", "a98655387762394371b88cdfb8215884757978ab" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 28 13:51:40 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 28 13:51:40 2013 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next\n" }, { "commit": "b35c809708ad245a36bef94d6fb1e83f6ab850aa", "tree": "c6dc6580546c9a5997eae06c8409f986c383d2a4", "parents": [ "6e956da2027c767859128b9bfef085cf2a8e233b", "19c361608ce3e73f352e323262f7e0a8264be3af" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 28 10:36:09 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Aug 28 10:36:09 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/pcie/trans.c\n\tnet/mac80211/ibss.c\n" }, { "commit": "5b2941b18dc5f60a5c14a5c15693f9c58b0dd922", "tree": "30351cd35586f3acf9907aa0f3b4ab9d4f7be81f", "parents": [ "b6750b4056720629e4c1e2e0d05f63692bffad27", "5828cd9a68873df1340b420371c02c47647878fb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 27 22:11:18 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 27 22:11:18 2013 -0400" }, "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\nA number of significant new features and optimizations for net-next/3.12.\nHighlights are:\n * \"Megaflows\", an optimization that allows userspace to specify which\n flow fields were used to compute the results of the flow lookup.\n This allows for a major reduction in flow setups (the major\n performance bottleneck in Open vSwitch) without reducing flexibility.\n * Converting netlink dump operations to use RCU, allowing for\n additional parallelism in userspace.\n * Matching and modifying SCTP protocol fields.\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": "81eb6a1487718a89621a0e0be7fafd0cd7c429a4", "tree": "05c8e0e54aa0c9739b5b7cd46d29d5385cb1ede0", "parents": [ "48b1de4c110a7afa4b85862f6c75af817db26fad" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Aug 27 08:50:15 2013 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Aug 28 00:28:04 2013 +0200" }, "message": "net: syncookies: export cookie_v6_init_sequence/cookie_v6_check\n\nExtract the local TCP stack independant parts of tcp_v6_init_sequence()\nand cookie_v6_check() and export them for use by the upcoming IPv6 SYNPROXY\ntarget.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nTested-by: Martin Topholm \u003cmph@one.com\u003e\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "48b1de4c110a7afa4b85862f6c75af817db26fad", "tree": "9d5af0462fdfda02e8eba53018f3e9e577c657f2", "parents": [ "0198230b7705eb2386e53778d944e307eef0cc71" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Aug 27 08:50:14 2013 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Aug 28 00:27:54 2013 +0200" }, "message": "netfilter: add SYNPROXY core/target\n\nAdd a SYNPROXY for netfilter. The code is split into two parts, the synproxy\ncore with common functions and an address family specific target.\n\nThe SYNPROXY receives the connection request from the client, responds with\na SYN/ACK containing a SYN cookie and announcing a zero window and checks\nwhether the final ACK from the client contains a valid cookie.\n\nIt then establishes a connection to the original destination and, if\nsuccessful, sends a window update to the client with the window size\nannounced by the server.\n\nSupport for timestamps, SACK, window scaling and MSS options can be\nstatically configured as target parameters if the features of the server\nare known. If timestamps are used, the timestamp value sent back to\nthe client in the SYN/ACK will be different from the real timestamp of\nthe server. In order to now break PAWS, the timestamps are translated in\nthe direction server-\u003eclient.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nTested-by: Martin Topholm \u003cmph@one.com\u003e\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "0198230b7705eb2386e53778d944e307eef0cc71", "tree": "0f1a970873df8a3dd3c1111020b6555e8f8d0518", "parents": [ "41d73ec053d2424599c4ed8452b889374d523ade" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Aug 27 08:50:13 2013 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Aug 28 00:27:44 2013 +0200" }, "message": "net: syncookies: export cookie_v4_init_sequence/cookie_v4_check\n\nExtract the local TCP stack independant parts of tcp_v4_init_sequence()\nand cookie_v4_check() and export them for use by the upcoming SYNPROXY\ntarget.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nTested-by: Martin Topholm \u003cmph@one.com\u003e\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "41d73ec053d2424599c4ed8452b889374d523ade", "tree": "404e0418e7f4c06cd37065eee97f67f6123df160", "parents": [ "706f5151e349a3d8ab85237d0d6c553930376e9f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Aug 27 08:50:12 2013 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Aug 28 00:26:48 2013 +0200" }, "message": "netfilter: nf_conntrack: make sequence number adjustments usuable without NAT\n\nSplit out sequence number adjustments from NAT and move them to the conntrack\ncore to make them usable for SYN proxying. The sequence number adjustment\ninformation is moved to a seperate extend. The extend is added to new\nconntracks when a NAT mapping is set up for a connection using a helper.\n\nAs a side effect, this saves 24 bytes per connection with NAT in the common\ncase that a connection does not have a helper assigned.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nTested-by: Martin Topholm \u003cmph@one.com\u003e\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "b05930f5d1c7d5873cb050261d21789a99de9d48", "tree": "2d374846712b0bdacc5dd0a36b3c2f754886e560", "parents": [ "b65f63ee845136940db985f3072335d8cdb6fd6c", "41a00f7950a6bc0aa956f6d6b423f0fbf34d431a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 26 16:37:08 2013 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 26 16:37:08 2013 -0400" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/pcie/trans.c\n\tinclude/linux/inetdevice.h\n\nThe inetdevice.h conflict involves moving the IPV4_DEVCONF values\ninto a UAPI header, overlapping additions of some new entries.\n\nThe iwlwifi conflict is a context overlap.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "50192abe02929586111fb33f216060a9341875f1", "tree": "c766629c78fc8410eb452e018b0ba4b629141a3e", "parents": [ "e0d6cb9cd3a3ac8a3b8e5b22b83c4f8619786f22" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Wed Aug 21 18:24:47 2013 +0100" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 26 10:28:46 2013 -0500" }, "message": "fs/9p: avoid accessing utsname after namespace has been torn down\n\nDuring trinity fuzzing in a kvmtool guest, I stumbled across the\nfollowing:\n\nUnable to handle kernel NULL pointer dereference at virtual address 00000004\nPC is at v9fs_file_do_lock+0xc8/0x1a0\nLR is at v9fs_file_do_lock+0x48/0x1a0\n[\u003cc01e2ed0\u003e] (v9fs_file_do_lock+0xc8/0x1a0) from [\u003cc0119154\u003e] (locks_remove_flock+0x8c/0x124)\n[\u003cc0119154\u003e] (locks_remove_flock+0x8c/0x124) from [\u003cc00d9bf0\u003e] (__fput+0x58/0x1e4)\n[\u003cc00d9bf0\u003e] (__fput+0x58/0x1e4) from [\u003cc0044340\u003e] (task_work_run+0xac/0xe8)\n[\u003cc0044340\u003e] (task_work_run+0xac/0xe8) from [\u003cc002e36c\u003e] (do_exit+0x6bc/0x8d8)\n[\u003cc002e36c\u003e] (do_exit+0x6bc/0x8d8) from [\u003cc002e674\u003e] (do_group_exit+0x3c/0xb0)\n[\u003cc002e674\u003e] (do_group_exit+0x3c/0xb0) from [\u003cc002e6f8\u003e] (__wake_up_parent+0x0/0x18)\n\nI believe this is due to an attempt to access utsname()-\u003enodename, after\nexit_task_namespaces() has been called, leaving current-\u003ensproxy-\u003euts_ns\nas NULL and causing the above dereference.\n\nA similar issue was fixed for lockd in 9a1b6bf818e7 (\"LOCKD: Don\u0027t call\nutsname()-\u003enodename from nlmclnt_setlockargs\"), so this patch attempts\nsomething similar for 9pfs.\n\nCc: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\nCc: Ron Minnich \u003crminnich@sandia.gov\u003e\nCc: Latchesar Ionkov \u003clucho@ionkov.net\u003e\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "5a25cf1e310888eb333f9e034be84a8117111d30", "tree": "0560fa869eb034e063854e42490c6556f69aa12d", "parents": [ "844d48746e4b281a933aedc0428048a1219b42f4" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Mon Aug 26 12:31:19 2013 +0200" }, "committer": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Mon Aug 26 12:40:53 2013 +0200" }, "message": "xfrm: revert ipv4 mtu determination to dst_mtu\n\nIn commit 0ea9d5e3e0e03a63b11392f5613378977dae7eca (\"xfrm: introduce\nhelper for safe determination of mtu\") I switched the determination of\nipv4 mtus from dst_mtu to ip_skb_dst_mtu. This was an error because in\ncase of IP_PMTUDISC_PROBE we fall back to the interface mtu, which is\nnever correct for ipv4 ipsec.\n\nThis patch partly reverts 0ea9d5e3e0e03a63b11392f5613378977dae7eca\n(\"xfrm: introduce helper for safe determination of mtu\").\n\nCc: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\n" }, { "commit": "280c571e1a0f553d4f2384f1a8b643b5de26e0ec", "tree": "f31512201922e08749d568b2172ab64cbcb46790", "parents": [ "03f0d916aa0317592dda11bd17c7357858719b6c" ], "author": { "name": "Joe Stringer", "email": "joe@wand.net.nz", "time": "Tue Jul 23 13:37:45 2013 +0900" }, "committer": { "name": "Jesse Gross", "email": "jesse@nicira.com", "time": "Fri Aug 23 16:43:08 2013 -0700" }, "message": "net: Add NEXTHDR_SCTP to ipv6.h\n\nSigned-off-by: Joe Stringer \u003cjoe@wand.net.nz\u003e\nSigned-off-by: Jesse Gross \u003cjesse@nicira.com\u003e\n" }, { "commit": "81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f", "tree": "6e21a27d727481434b58543d8cff960bb7672b53", "parents": [ "4a5a8aa6c966eafc106543bd955ae388230420e5", "19c361608ce3e73f352e323262f7e0a8264be3af" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 23 11:47:48 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 23 11:47:48 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "19504cf5f35fbe85db811fce9f4392a0cbdada2f", "tree": "29e8eaeb1a062cb3e843781c7dc4add821fd592b", "parents": [ "c4c205f3cd17b567b8e20098522416eac2e73960" ], "author": { "name": "Vladimir Kondratiev", "email": "qca_vkondrat@qca.qualcomm.com", "time": "Thu Aug 15 14:51:28 2013 +0300" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Aug 23 16:06:03 2013 +0200" }, "message": "cfg80211: add flags to cfg80211_rx_mgmt()\n\nAdd flags intended to report various auxiliary information\nand introduce the NL80211_RXMGMT_FLAG_ANSWERED flag to report\nthat the frame was already answered by the device.\n\nSigned-off-by: Vladimir Kondratiev \u003cqca_vkondrat@qca.qualcomm.com\u003e\n[REPLIED-\u003eANSWERED, reword commit message]\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "c92a59eca86f5d13ae4d481c3bae6b54609fe006", "tree": "627c129f365ec275624f1ffa5a50d3c1c13105c2", "parents": [ "6e1f99757a2b24b7255263b2240a0eb04215174d" ], "author": { "name": "Duan Jiong", "email": "duanj.fnst@cn.fujitsu.com", "time": "Thu Aug 22 12:07:35 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 22 20:08:21 2013 -0700" }, "message": "ipv6: handle Redirect ICMP Message with no Redirected Header option\n\nrfc 4861 says the Redirected Header option is optional, so\nthe kernel should not drop the Redirect Message that has no\nRedirected Header option. In this patch, the function\nip6_redirect_no_header() is introduced to deal with that\ncondition.\n\nSigned-off-by: Duan Jiong \u003cduanj.fnst@cn.fujitsu.com\u003e\nAcked-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\n" }, { "commit": "baf3b3f227e6d2c143a03f03dcbd50b55089eda4", "tree": "3744aa127aa718733ab3712bd40dac62d207511e", "parents": [ "3bca8de22082f6c02a176dbb344e5234d9d5cc02", "e3fec5a1c5a1ab4a85ca3f4e41c626fb953ce162" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 22 16:04:41 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 22 16:04:41 2013 -0700" }, "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\n1) Some constifications, from Mathias Krause.\n\n2) Catch bugs if a hold timer is still active when xfrm_policy_destroy()\n is called, from Fan Du.\n\n3) Remove a redundant address family checking, from Fan Du.\n\n4) Make xfrm_state timer monotonic to be independent of system clock changes,\n from Fan Du.\n\n5) Remove an outdated comment on returning -EREMOTE in the xfrm_lookup(),\n from Rami Rosen.\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": "69b307a48a5e10d5fd53dbbfae1c700da356bd5d", "tree": "0a09cc42b3a592d19e5229a84c93f2b58f8c89d3", "parents": [ "24de851b79a414f0e1813eb131a7d90849cc22c2", "2dea632f9acad076370fe871d4ccc93868621403" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 22 14:27:31 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 22 14:27:31 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next\n" }, { "commit": "89b5f74a268d6a7037c8ea9d9b7d4ce35097c6fd", "tree": "15e14665089f6603c07e4bfc8ba4011f97a23744", "parents": [ "48c3e371350701444db51e8b35b5928d74dbacc3", "75a423f493ffdf741acae27bf179cd560f7813d7" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 22 11:35:22 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 22 11:35:22 2013 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211\n" }, { "commit": "2dea632f9acad076370fe871d4ccc93868621403", "tree": "a42fe58da21e9056bd93fd423baf8ebdc2700512", "parents": [ "1a4c958cf9b1e159bc63d63b9e362904dd2c4ac3" ], "author": { "name": "Frédéric Dalleau", "email": "frederic.dalleau@linux.intel.com", "time": "Mon Aug 19 14:24:03 2013 +0200" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Wed Aug 21 16:47:13 2013 +0200" }, "message": "Bluetooth: Add SCO connection fallback\n\nWhen initiating a transparent eSCO connection, make use of T2 settings\nat first try. T2 is the recommended settings from HFP 1.6 WideBand\nSpeech. Upon connection failure, try T1 settings.\n\nWhen CVSD is requested and eSCO is supported, try to establish eSCO\nconnection using S3 settings. If it fails, fallback in sequence to S2,\nS1, D1, D0 settings.\n\nTo know which setting should be used, conn-\u003eattempt is used. It\nindicates the currently ongoing SCO connection attempt and can be used\nas the index for the fallback settings table.\n\nThese setting and the fallback order are described in Bluetooth HFP 1.6\nspecification p. 101.\n\nSigned-off-by: Frédéric Dalleau \u003cfrederic.dalleau@linux.intel.com\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "07a5c61eda7f23883273f738edbf6caaebb71923", "tree": "79465249af68705f5da90cbe7c2c727b8ab6844b", "parents": [ "10c62ddc6f032c3a096401ca3ce7e5b2d5780859" ], "author": { "name": "Frédéric Dalleau", "email": "frederic.dalleau@linux.intel.com", "time": "Mon Aug 19 14:24:00 2013 +0200" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Wed Aug 21 16:47:12 2013 +0200" }, "message": "Bluetooth: Add constants and macro declaration for transparent data\n\nThis patch defines constants and macro for transparent data LMP\nfeatures. It refers to Bluetooth Core V4.0 specification, Part C, Chap\n3.3 which defines LMP feature mask.\n\nSigned-off-by: Frédéric Dalleau \u003cfrederic.dalleau@linux.intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "10c62ddc6f032c3a096401ca3ce7e5b2d5780859", "tree": "e93236eefeb9931f34aae703b2f44a690d060d5d", "parents": [ "2f69a82acf6f971a9e184dd32b24c79a14388a6c" ], "author": { "name": "Frédéric Dalleau", "email": "frederic.dalleau@linux.intel.com", "time": "Mon Aug 19 14:23:59 2013 +0200" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Wed Aug 21 16:47:11 2013 +0200" }, "message": "Bluetooth: Parameters for outgoing SCO connections\n\nIn order to establish a transparent SCO connection, the correct settings\nmust be specified in the Setup Synchronous Connection request. For that,\na setting field is added to ACL connection data to set up the desired\nparameters. The patch also removes usage of hdev-\u003evoice_setting in CVSD\nconnection and makes use of T2 parameters for transparent data.\n\nSigned-off-by: Frédéric Dalleau \u003cfrederic.dalleau@linux.intel.com\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "5d4d62f6ca04c54ed6c84df6adf5427c52feda3e", "tree": "7446ab98ffe09d43ab19dfdcb4c1e604d1e6c13e", "parents": [ "ad10b1a48754b1381582d96f070a39832e41382d" ], "author": { "name": "Frédéric Dalleau", "email": "frederic.dalleau@linux.intel.com", "time": "Mon Aug 19 14:23:57 2013 +0200" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Wed Aug 21 16:47:10 2013 +0200" }, "message": "Bluetooth: Add constants for SCO airmode\n\nThis patch defines constants for SCO airmode from SCO voice setting. It\nrefers to Bluetooth Core V4.0 specification, Part E, Chap 6.12 which\ndescribe SCO voice setting format.\n\nSigned-off-by: Frédéric Dalleau \u003cfrederic.dalleau@linux.intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "ad10b1a48754b1381582d96f070a39832e41382d", "tree": "7111567e3b1e7b283ec7d2617136f244660487ad", "parents": [ "33f2404823f000f9b5fc570b0a08b1008e241578" ], "author": { "name": "Frédéric Dalleau", "email": "frederic.dalleau@linux.intel.com", "time": "Mon Aug 19 14:23:56 2013 +0200" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Wed Aug 21 16:47:09 2013 +0200" }, "message": "Bluetooth: Add Bluetooth socket voice option\n\nThis patch extends the current Bluetooth socket options with BT_VOICE.\nThis is intended to choose voice data type at runtime. It only applies\nto SCO sockets. Incoming connections shall be setup during deferred\nsetup. Outgoing connections shall be setup before connect(). The desired\nsetting is stored in the SCO socket info. This patch declares needed\nmembers, modifies getsockopt() and setsockopt().\n\nSigned-off-by: Frédéric Dalleau \u003cfrederic.dalleau@linux.intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "e660ed6c70370dae0887e2b5224d8b6c1e138120", "tree": "acf4bbcd791e700d8cde43d75b1940dcb211b15f", "parents": [ "ffe6b68cc5999a3f91a15b6667e69e14186e337d" ], "author": { "name": "Frédéric Dalleau", "email": "frederic.dalleau@linux.intel.com", "time": "Mon Aug 19 14:23:54 2013 +0200" }, "committer": { "name": "Gustavo Padovan", "email": "gustavo.padovan@collabora.co.uk", "time": "Wed Aug 21 16:47:08 2013 +0200" }, "message": "Bluetooth: Use hci_connect_sco directly\n\nhci_connect is a super function for connecting hci protocols. But the\nvoice_setting parameter (introduced in subsequent patches) is only\nneeded by SCO and security requirements are not needed for SCO channels.\nThus, it makes sense to have a separate function for SCO.\n\nSigned-off-by: Frédéric Dalleau \u003cfrederic.dalleau@linux.intel.com\u003e\nAcked-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@intel.com\u003e\nSigned-off-by: Gustavo Padovan \u003cgustavo.padovan@collabora.co.uk\u003e\n" }, { "commit": "2dfca312a91631311c1cf7c090246cc8103de038", "tree": "3830dfe9ef53716ec408976758fe63019c498f6b", "parents": [ "2a3ba63c235fdcd37f6451bdf4a0c7865a3930cf" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Tue Aug 20 19:43:54 2013 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Aug 21 15:03:25 2013 +0200" }, "message": "mac80211: add a flag to indicate CCK support for HT clients\n\nbrcm80211 cannot handle sending frames with CCK rates as part of an\nA-MPDU session. Other drivers may have issues too. Set the flag in all\ndrivers that have been tested with CCK rates.\n\nThis fixes a reported brcmsmac regression introduced in\ncommit ef47a5e4f1aaf1d0e2e6875e34b2c9595897bef6\n\"mac80211/minstrel_ht: fix cck rate sampling\"\n\nCc: stable@vger.kernel.org # 3.10\nReported-by: Tom Gundersen \u003cteg@jklm.no\u003e\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "89d5e23210f53ab53b7ff64843bce62a106d454f", "tree": "1be286a315bb017259da19eb1a5e92c5110dbc3b", "parents": [ "15ec80f5d4ad4d62ba3f19c90b3c995690b02103", "38c67328ac79cb9eaf61b5d4750fe3b9cff0dd15" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 20 13:30:54 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 20 13:30:54 2013 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next\n\nConflicts:\n\tnet/netfilter/nf_conntrack_proto_tcp.c\n\nThe conflict had to do with overlapping changes dealing with\nfixing the use of an \"s32\" to hold the value returned by\nNAT_OFFSET().\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\nThe following batch contains Netfilter/IPVS updates for your net-next tree.\nMore specifically, they are:\n\n* Trivial typo fix in xt_addrtype, from Phil Oester.\n\n* Remove net_ratelimit in the conntrack logging for consistency with other\n logging subsystem, from Patrick McHardy.\n\n* Remove unneeded includes from the recently added xt_connlabel support, from\n Florian Westphal.\n\n* Allow to update conntracks via nfqueue, don\u0027t need NFQA_CFG_F_CONNTRACK for\n this, from Florian Westphal.\n\n* Remove tproxy core, now that we have socket early demux, from Florian\n Westphal.\n\n* A couple of patches to refactor conntrack event reporting to save a good\n bunch of lines, from Florian Westphal.\n\n* Fix missing locking in NAT sequence adjustment, it did not manifested in\n any known bug so far, from Patrick McHardy.\n\n* Change sequence number adjustment variable to 32 bits, to delay the\n possible early overflow in long standing connections, also from Patrick.\n\n* Comestic cleanups for IPVS, from Dragos Foianu.\n\n* Fix possible null dereference in IPVS in the SH scheduler, from Daniel\n Borkmann.\n\n* Allow to attach conntrack expectations via nfqueue. Before this patch, you\n had to use ctnetlink instead, thus, we save the conntrack lookup.\n\n* Export xt_rpfilter and xt_HMARK header files, from Nicolas Dichtel.\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": "49560532d74962608526121ecb0d2ad0c87f9cc0", "tree": "dc7a6bbdda48791d0528cc67c5abe06c64d6bb1a", "parents": [ "012a5729ff933ecd07e7470a65d84577aef9ae03" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Mon Aug 19 11:23:17 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 20 00:15:43 2013 -0700" }, "message": "vxlan: Factor out vxlan send api.\n\nFollowing patch allows more code sharing between vxlan and ovs-vxlan.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "012a5729ff933ecd07e7470a65d84577aef9ae03", "tree": "354e8f359ed8a01c0eb54061c49a7cecc7b472da", "parents": [ "5cfccc5a47ebcaac5d5fa82a6dcef94a78b1eb6c" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Mon Aug 19 11:23:07 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 20 00:15:43 2013 -0700" }, "message": "vxlan: Extend vxlan handlers for openvswitch.\n\nFollowing patch adds data field to vxlan socket and export\nvxlan handler api.\nvh-\u003edata is required to store private data per vxlan handler.\n\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "844d48746e4b281a933aedc0428048a1219b42f4", "tree": "d456114029573629bada5ee6882e89f18c42cb18", "parents": [ "5d0ff542d0264f61dc4bdb34eba39ffb4ea3bc23" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Sun Aug 18 13:47:01 2013 +0200" }, "committer": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Mon Aug 19 09:39:04 2013 +0200" }, "message": "xfrm: choose protocol family by skb protocol\n\nWe need to choose the protocol family by skb-\u003eprotocol. Otherwise we\ncall the wrong xfrm{4,6}_local_error handler in case an ipv6 sockets is\nused in ipv4 mode, in which case we should call down to xfrm4_local_error\n(ip6 sockets are a superset of ip4 ones).\n\nWe are called before before ip_output functions, so skb-\u003eprotocol is\nnot reset.\n\nCc: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nAcked-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\n" }, { "commit": "2ff1cf12c9fe70e75e600404e6a4274b19d293ed", "tree": "beafddac0a8098e3f07d2ec60e44a2a7d006e605", "parents": [ "16b304f3404f8e0243d5ee2b70b68767b7b59b2b", "0f7dd1aa8f959216f1faa71513b9d3c1a9065e5a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 16 15:37:26 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 16 15:37:26 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "d0746663667f37e7be5646bf68cb452c8375a23d", "tree": "85ae5a3d5e5bae53815baba5dba372e4d53a9745", "parents": [ "41caa760d6acaf47cbd44c3d78307fb9be089111", "27b3eb9c06a7193bdc9800cd00764a130343bc8a" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 16 14:24:51 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 16 14:24:51 2013 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next\n" }, { "commit": "27b3eb9c06a7193bdc9800cd00764a130343bc8a", "tree": "d73ca7dfb8ccc2e967f4acf603c5bd52ca641db5", "parents": [ "d51b70ff5122d31e27733ba03c3afd62bb86bd63" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Wed Aug 07 20:11:55 2013 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Fri Aug 16 12:58:43 2013 +0200" }, "message": "mac80211: add APIs to allow keeping connections after WoWLAN\n\nIn order to be able to (securely) keep connections alive after\nthe system was suspended for WoWLAN, we need some additional\nAPIs. We already have API (ieee80211_gtk_rekey_notify) to tell\nwpa_supplicant about the new replay counter if GTK rekeying\nwas done by the device while the host was asleep, but that\u0027s\nnot sufficient.\n\nIf GTK rekeying wasn\u0027t done, we need to tell the host about\nsequence counters for the GTK (and PTK regardless of rekeying)\nthat was used while asleep, add ieee80211_set_key_rx_seq() for\nthat.\n\nIf GTK rekeying was done, then we need to be able to disable\nthe old keys (with ieee80211_remove_key()) and allocate the\nnew GTK key(s) in mac80211 (with ieee80211_gtk_rekey_add()).\n\nIf protocol offload (e.g. ARP) is implemented, then also the\nTX sequence counter for the PTK must be updated, using the new\nieee80211_set_key_tx_seq() function.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "8a8e3d84b1719a56f9151909e80ea6ebc5b8e318", "tree": "be050c259ea5bfc41731ac0581df4f57034cb7a3", "parents": [ "09a8f03197d4799bc9969b35240e5606c026ded6" ], "author": { "name": "Jesper Dangaard Brouer", "email": "brouer@redhat.com", "time": "Wed Aug 14 23:47:11 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 15 01:43:08 2013 -0700" }, "message": "net_sched: restore \"linklayer atm\" handling\n\ncommit 56b765b79 (\"htb: improved accuracy at high rates\")\nbroke the \"linklayer atm\" handling.\n\n tc class add ... htb rate X ceil Y linklayer atm\n\nThe linklayer setting is implemented by modifying the rate table\nwhich is send to the kernel. No direct parameter were\ntransferred to the kernel indicating the linklayer setting.\n\nThe commit 56b765b79 (\"htb: improved accuracy at high rates\")\nremoved the use of the rate table system.\n\nTo keep compatible with older iproute2 utils, this patch detects\nthe linklayer by parsing the rate table. It also supports future\nversions of iproute2 to send this linklayer parameter to the\nkernel directly. This is done by using the __reserved field in\nstruct tc_ratespec, to convey the choosen linklayer option, but\nonly using the lower 4 bits of this field.\n\nLinklayer detection is limited to speeds below 100Mbit/s, because\nat high rates the rtab is gets too inaccurate, so bad that\nseveral fields contain the same values, this resembling the ATM\ndetect. Fields even start to contain \"0\" time to send, e.g. at\n1000Mbit/s sending a 96 bytes packet cost \"0\", thus the rtab have\nbeen more broken than we first realized.\n\nSigned-off-by: Jesper Dangaard Brouer \u003cbrouer@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0bd8762824e73a3cce7b7560a97463301764b616", "tree": "1de2d9f01b9947e87705c7d00082fa474e517c5f", "parents": [ "6c742e714d8c282fd8f8b22d3e20b5141738c1ee" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Tue Aug 13 17:51:12 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 15 01:00:20 2013 -0700" }, "message": "ip6tnl: add x-netns support\n\nThis patch allows to switch the netns when packet is encapsulated or\ndecapsulated. In other word, the encapsulated packet is received in a netns,\nwhere the lookup is done to find the tunnel. Once the tunnel is found, the\npacket is decapsulated and injecting into the corresponding interface which\nstands to another netns.\n\nWhen one of the two netns is removed, the tunnel is destroyed.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c742e714d8c282fd8f8b22d3e20b5141738c1ee", "tree": "e941ce5158e8fd6e33230f0642f391bca2113796", "parents": [ "fc8f999daa10a5c5c19562b88be96a9b2bacd9b7" ], "author": { "name": "Nicolas Dichtel", "email": "nicolas.dichtel@6wind.com", "time": "Tue Aug 13 17:51:11 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 15 01:00:20 2013 -0700" }, "message": "ipip: add x-netns support\n\nThis patch allows to switch the netns when packet is encapsulated or\ndecapsulated. In other word, the encapsulated packet is received in a netns,\nwhere the lookup is done to find the tunnel. Once the tunnel is found, the\npacket is decapsulated and injecting into the corresponding interface which\nstands to another netns.\n\nWhen one of the two netns is removed, the tunnel is destroyed.\n\nSigned-off-by: Nicolas Dichtel \u003cnicolas.dichtel@6wind.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ea9d5e3e0e03a63b11392f5613378977dae7eca", "tree": "a363333080f9f8647f3f80dc7e736a308c36b7cb", "parents": [ "628e341f319f1a64a4639088faba952e4ec8f0a8" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Tue Aug 13 04:35:58 2013 +0200" }, "committer": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Wed Aug 14 13:09:07 2013 +0200" }, "message": "xfrm: introduce helper for safe determination of mtu\n\nskb-\u003esk socket can be of AF_INET or AF_INET6 address family. Thus we\nalways have to make sure we a referring to the correct interpretation\nof skb-\u003esk.\n\nWe only depend on header defines to query the mtu, so we don\u0027t introduce\na new dependency to ipv6 by this change.\n\nCc: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\n" }, { "commit": "628e341f319f1a64a4639088faba952e4ec8f0a8", "tree": "28fd4b1a02ca00a1abe0b1e71898ab8db6a81dad", "parents": [ "d9bf5f130946695063469749bfd190087b7fad39" ], "author": { "name": "Hannes Frederic Sowa", "email": "hannes@stressinduktion.org", "time": "Wed Aug 14 13:05:23 2013 +0200" }, "committer": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Wed Aug 14 13:07:12 2013 +0200" }, "message": "xfrm: make local error reporting more robust\n\nIn xfrm4 and xfrm6 we need to take care about sockets of the other\naddress family. This could happen because a 6in4 or 4in6 tunnel could\nget protected by ipsec.\n\nBecause we don\u0027t want to have a run-time dependency on ipv6 when only\nusing ipv4 xfrm we have to embed a pointer to the correct local_error\nfunction in xfrm_state_afinet and look it up when returning an error\ndepending on the socket address family.\n\nThanks to vi0ss for the great bug report:\n\u003chttps://bugzilla.kernel.org/show_bug.cgi?id\u003d58691\u003e\n\nv2:\na) fix two more unsafe interpretations of skb-\u003esk as ipv6 socket\n (xfrm6_local_dontfrag and __xfrm6_output)\nv3:\na) add an EXPORT_SYMBOL_GPL(xfrm_local_error) to fix a link error when\n building ipv6 as a module (thanks to Steffen Klassert)\n\nReported-by: \u003cvi0oss@gmail.com\u003e\nCc: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\nSigned-off-by: Hannes Frederic Sowa \u003channes@stressinduktion.org\u003e\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\n" }, { "commit": "4221f40513233fa8edeef7fc82e44163fde03b9b", "tree": "b7213a4e780c4c5b61ef4f103bcd5346c960a365", "parents": [ "50f850fdf91a9ed21bfca982932520ee21a4ccb9" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Tue Aug 13 01:41:06 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 13 16:52:50 2013 -0700" }, "message": "ip_tunnel: Do not use inner ip-header-id for tunnel ip-header-id.\n\nUsing inner-id for tunnel id is not safe in some rare cases.\nE.g. packets coming from multiple sources entering same tunnel\ncan have same id. Therefore on tunnel packet receive we\ncould have packets from two different stream but with same\nsource and dst IP with same ip-id which could confuse ip packet\nreassembly.\n\nFollowing patch reverts optimization from commit\n490ab08127 (IP_GRE: Fix IP-Identification.)\n\nCC: Jarno Rajahalme \u003cjrajahalme@nicira.com\u003e\nCC: Ansis Atteka \u003caatteka@nicira.com\u003e\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "352a5f5fb3ad8f829cfd4248fe6119895bda881f", "tree": "48cb511da5f44e083d2773ce1b1d62100c01cf49", "parents": [ "eab10b71a7d62d7cc6db631dba448f1d84df9b53" ], "author": { "name": "Eric Lapuyade", "email": "eric.lapuyade@linux.intel.com", "time": "Fri Jul 19 14:57:55 2013 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Aug 14 01:12:58 2013 +0200" }, "message": "NFC: netlink: Add result of firmware operation to completion event\n\nResult is added as an NFC_ATTR_FIRMWARE_DOWNLOAD_STATUS attribute\ncontaining the standard errno positive value of the completion result.\nThis event will be sent when the firmare download operation is done and\nwill contain the operation result.\n\nSigned-off-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "ef04158e13e827315680cf8449d9af3bd8dc6280", "tree": "61488d05c828659edc85f03318dd6887c6cc551f", "parents": [ "dfccd0f580445d176acea174175b3e6518cc91f7" ], "author": { "name": "Eric Lapuyade", "email": "eric.lapuyade@linux.intel.com", "time": "Fri Jul 19 14:56:08 2013 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Wed Aug 14 01:08:01 2013 +0200" }, "message": "NFC: Move nfc_fw_download_done() definition from private to public\n\nThis API must be called by NFC drivers, and its prototype was\nincorrectly placed.\n\nSigned-off-by: Eric Lapuyade \u003ceric.lapuyade@intel.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "bd0779370588386e4a67ba5d0b176cfded8e6a53", "tree": "7fddb1464b457c3288ced39a635fd38f0d207ba5", "parents": [ "0ef71ee1a5b92c038abefd8991d5368e6031d7de" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Aug 07 18:13:20 2013 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Aug 13 16:32:10 2013 +0200" }, "message": "netfilter: nfnetlink_queue: allow to attach expectations to conntracks\n\nThis patch adds the capability to attach expectations via nfnetlink_queue.\nThis is required by conntrack helpers that trigger expectations based on\nthe first packet seen like the TFTP and the DHCPv6 user-space helpers.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "89c2af3c14ddf8ae48637a7b454d66ac5e0ca728", "tree": "77faf3fc889fb0e77ce7c4778f2bbc93fdf8cdd2", "parents": [ "f3dfd20860db3d0c400dd83a378176a28d3662db", "d1e2586f484dfc36eee2b2d3a6c6c77be67ca492" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 12 14:45:06 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Aug 12 14:45:06 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tdrivers/net/ethernet/broadcom/Kconfig\n" }, { "commit": "52981cd79461e47fe683febfcbd3d380c72b1c6c", "tree": "a6d149e4d43930d57c81f7a2b00380b26a395307", "parents": [ "fc73f11f5fa230f8c687d51b0fddb00433092ce0" ], "author": { "name": "David Spinadel", "email": "david.spinadel@intel.com", "time": "Wed Jul 31 18:06:22 2013 +0300" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Aug 12 14:11:42 2013 +0200" }, "message": "mac80211: add vif to testmode cmd\n\nPass the wdev from cfg80211 on to the driver as the vif\nif given and it\u0027s valid for the driver.\n\nSigned-off-by: David Spinadel \u003cdavid.spinadel@intel.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "fc73f11f5fa230f8c687d51b0fddb00433092ce0", "tree": "f1c2e5c855a97dd4039b3df2a0b8cde96744898f", "parents": [ "af61a165187bb94b1dc7628ef815c23d0eacf40b" ], "author": { "name": "David Spinadel", "email": "david.spinadel@intel.com", "time": "Wed Jul 31 18:04:15 2013 +0300" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Aug 12 14:11:37 2013 +0200" }, "message": "cfg80211: add wdev to testmode cmd\n\nTo allow drivers to implement per-interface testmode operations\nmore easily, pass a wdev pointer if any identification for one\nwas given from userspace. Clean up the code a bit while at it.\n\nSigned-off-by: David Spinadel \u003cdavid.spinadel@intel.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "af61a165187bb94b1dc7628ef815c23d0eacf40b", "tree": "9dae3fcf629a55b0f3e91bec51ad92a9d77e6402", "parents": [ "1da5fcc86d71040c5b294ca5611ae6c86bfa815c" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Tue Jul 02 18:09:12 2013 +0200" }, "committer": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Mon Aug 12 14:09:29 2013 +0200" }, "message": "mac80211: add control port protocol TX control flag\n\nA lot of drivers check the frame protocol for ETH_P_PAE,\nfor various reasons (like making those more reliable).\nAdd a new flags bitmap to the TX control info and a new\nflag indicating the control port protocol is in use to\nlet all drivers also apply such logic to other control\nport protocols, should they be configured.\n\nAlso use the new flag in the iwlwifi drivers.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\n" }, { "commit": "28d6427109d13b0f447cba5761f88d3548e83605", "tree": "5f463fa756d508625e8cea1da31406e66a0b263e", "parents": [ "e370a7236321773245c5522d8bb299380830d3b2" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Aug 08 14:38:47 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 10 01:16:44 2013 -0700" }, "message": "net: attempt high order allocations in sock_alloc_send_pskb()\n\nAdding paged frags skbs to af_unix sockets introduced a performance\nregression on large sends because of additional page allocations, even\nif each skb could carry at least 100% more payload than before.\n\nWe can instruct sock_alloc_send_pskb() to attempt high order\nallocations.\n\nMost of the time, it does a single page allocation instead of 8.\n\nI added an additional parameter to sock_alloc_send_pskb() to\nlet other users to opt-in for this new feature on followup patches.\n\nTested:\n\nBefore patch :\n\n$ netperf -t STREAM_STREAM\nSTREAM STREAM TEST\nRecv Send Send\nSocket Socket Message Elapsed\nSize Size Size Time Throughput\nbytes bytes bytes secs. 10^6bits/sec\n\n 2304 212992 212992 10.00 46861.15\n\nAfter patch :\n\n$ netperf -t STREAM_STREAM\nSTREAM STREAM TEST\nRecv Send Send\nSocket Socket Message Elapsed\nSize Size Size Time Throughput\nbytes bytes bytes secs. 10^6bits/sec\n\n 2304 212992 212992 10.00 57981.11\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e370a7236321773245c5522d8bb299380830d3b2", "tree": "e374e13b5fcccdd9aa28fcb5ab0dd3df05b4d384", "parents": [ "149479d019e06df5a7f4096f95c00cfb1380309c" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Thu Aug 08 14:37:32 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 10 01:16:44 2013 -0700" }, "message": "af_unix: improve STREAM behavior with fragmented memory\n\nunix_stream_sendmsg() currently uses order-2 allocations,\nand we had numerous reports this can fail.\n\nThe __GFP_REPEAT flag present in sock_alloc_send_pskb() is\nnot helping.\n\nThis patch extends the work done in commit eb6a24816b247c\n(\"af_unix: reduce high order page allocations) for\ndatagram sockets.\n\nThis opens the possibility of zero copy IO (splice() and\nfriends)\n\nThe trick is to not use skb_pull() anymore in recvmsg() path,\nand instead add a @consumed field in UNIXCB() to track amount\nof already read payload in the skb.\n\nThere is a performance regression for large sends\nbecause of extra page allocations that will be addressed\nin a follow-up patch, allowing sock_alloc_send_pskb()\nto attempt high order page allocations.\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "149479d019e06df5a7f4096f95c00cfb1380309c", "tree": "693d54479d3377a5b4bd7ddfb61394f26706defd", "parents": [ "469230d118dc0822f6bf46c75ab147fa9f00741f" ], "author": { "name": "Yuchung Cheng", "email": "ycheng@google.com", "time": "Thu Aug 08 14:06:22 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 10 00:35:33 2013 -0700" }, "message": "tcp: add server ip to encrypt cookie in fast open\n\nEncrypt the cookie with both server and client IPv4 addresses,\nsuch that multi-homed server will grant different cookies\nbased on both the source and destination IPs. No client change\nis needed since cookie is opaque to the client.\n\nSigned-off-by: Yuchung Cheng \u003cycheng@google.com\u003e\nReviewed-by: Eric Dumazet \u003cedumazet@google.com\u003e\nAcked-by: Neal Cardwell \u003cncardwell@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "71acc0ddd499cc323199fb1ae350ce9ea0744352", "tree": "496bb919783bb8a89302774be8c1f7a798b364ec", "parents": [ "477143e3fece3dc12629bb1ebd7b47e8e6e72b2b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 09 13:09:41 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 09 13:09:41 2013 -0700" }, "message": "Revert \"net: sctp: convert sctp_checksum_disable module param into sctp sysctl\"\n\nThis reverts commit cda5f98e36576596b9230483ec52bff3cc97eb21.\n\nAs per Vlad\u0027s request.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa5978447cb0144411df3a588e3d01459c12d855", "tree": "998e58c515def864c8cd87511625d1e7184a7a21", "parents": [ "2437f3c5d6bc07252c6d7d24448755e0c35ed91c", "73da7d5bab79ad7e16ff44d67c3fe8b9c0b33e5b" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 09 15:08:10 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 09 15:08:10 2013 -0400" }, "message": "Merge branch \u0027for-john\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next\n" }, { "commit": "4f0544489215fc78cccb96f8e3d0f078ae965297", "tree": "69e71db0cf005a68ab1b70f33ae0462fd94152fc", "parents": [ "2952f6ef5195ea76279f7370f0a6571867e54438", "5a6e0cf70743f30c17ccb5f228db9a124b0e7477" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 09 15:06:28 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Aug 09 15:06:28 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless\n" }, { "commit": "288a9376371d425edeeea41a0310922c5fb2092d", "tree": "815875620d171112bb635d0d2bfcf6e838985d3f", "parents": [ "d06f5187469eee1b2932c02fd093d113cfc60d5e" ], "author": { "name": "Eliezer Tamir", "email": "eliezer.tamir@linux.intel.com", "time": "Wed Aug 07 11:33:25 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 09 11:39:08 2013 -0700" }, "message": "net: rename busy poll MIB counter\n\nRename mib counter from \"low latency\" to \"busy poll\"\n\nv1 also moved the counter to the ip MIB (suggested by Shawn Bohrer)\nEric Dumazet suggested that the current location is better.\n\nSo v2 just renames the counter to fit the new naming convention.\n\nSigned-off-by: Eliezer Tamir \u003celiezer.tamir@linux.intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "477143e3fece3dc12629bb1ebd7b47e8e6e72b2b", "tree": "51ffb145b81bc54d7051d6798b67c1913d17b840", "parents": [ "cda5f98e36576596b9230483ec52bff3cc97eb21" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Tue Aug 06 21:18:13 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 09 11:33:02 2013 -0700" }, "message": "net: sctp: trivial: update bug report in header comment\n\nWith the restructuring of the lksctp.org site, we only allow bug\nreports through the SCTP mailing list linux-sctp@vger.kernel.org,\nnot via SF, as SF is only used for web hosting and nothing more.\nWhile at it, also remove the obvious statement that bugs will be\nfixed and incooperated into the kernel.\n\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nAcked-by: Vlad Yasevich \u003cvyasevich@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cda5f98e36576596b9230483ec52bff3cc97eb21", "tree": "b828a60d8b6000704d91e35d10247f322a8d3ef8", "parents": [ "2690048c01f32bf45d1c1e1ab3079bc10ad2aea7" ], "author": { "name": "Daniel Borkmann", "email": "dborkman@redhat.com", "time": "Tue Aug 06 21:18:12 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 09 11:33:02 2013 -0700" }, "message": "net: sctp: convert sctp_checksum_disable module param into sctp sysctl\n\nGet rid of the last module parameter for SCTP and make this\nconfigurable via sysctl for SCTP like all the rest of SCTP\u0027s\nconfiguration knobs.\n\nSigned-off-by: Daniel Borkmann \u003cdborkman@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c655bc6896b94ee0223393f26155c6daf1e2d148", "tree": "493664303eefd739303a67b891c0f7f89c92eb09", "parents": [ "54e35cc52346149a7bce8a2f622e215ed17bb56d" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Jul 29 15:41:55 2013 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Aug 09 12:03:33 2013 +0200" }, "message": "netfilter: nf_conntrack: don\u0027t send destroy events from iterator\n\nLet nf_ct_delete handle delivery of the DESTROY event.\n\nBased on earlier patch from Pablo Neira.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "6d37b97428d20a21ffc39ba90e97e91e2a79a986", "tree": "0ccfe669f4b04f814776b5293b05f0655558f777", "parents": [ "c9710d8018273b0740e0794858f1961fcea5e61a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Aug 08 20:11:22 2013 -0400" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Aug 08 20:11:22 2013 -0400" }, "message": "netprio_cgroup: pass around @css instead of @cgroup and kill struct cgroup_netprio_state\n\ncgroup controller API will be converted to primarily use struct\ncgroup_subsys_state instead of struct cgroup. In preparation, make\nthe internal functions of netprio_cgroup pass around @css instead of\n@cgrp.\n\nWhile at it, kill struct cgroup_netprio_state which only contained\nstruct cgroup_subsys_state without serving any purpose. All functions\nare converted to deal with @css directly.\n\nThis patch shouldn\u0027t cause any behavior differences.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8af01f56a03e9cbd91a55d688fce1315021efba8", "tree": "05c051bd8b188073bb4bf695c3a46c6592e86794", "parents": [ "61584e3f4964995e575618f76ff7197123796e75" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Aug 08 20:11:22 2013 -0400" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Aug 08 20:11:22 2013 -0400" }, "message": "cgroup: s/cgroup_subsys_state/cgroup_css/ s/task_subsys_state/task_css/\n\nThe names of the two struct cgroup_subsys_state accessors -\ncgroup_subsys_state() and task_subsys_state() - are somewhat awkward.\nThe former clashes with the type name and the latter doesn\u0027t even\nindicate it\u0027s somehow related to cgroup.\n\nWe\u0027re about to revamp large portion of cgroup API, so, let\u0027s rename\nthem so that they\u0027re less awkward. Most per-controller usages of the\naccessors are localized in accessor wrappers and given the amount of\nscheduled changes, this isn\u0027t gonna add any noticeable headache.\n\nRename cgroup_subsys_state() to cgroup_css() and task_subsys_state()\nto task_css(). This patch is pure rename.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Li Zefan \u003clizefan@huawei.com\u003e\n" }, { "commit": "6261d983f226f0a6a8d4d32b57a032bc23a5ebb6", "tree": "4bed875ac9758214183ebbed0e9b0f62afba617b", "parents": [ "8a56d243ca60c92c0b80307422ae75676873a715" ], "author": { "name": "stephen hemminger", "email": "stephen@networkplumber.org", "time": "Mon Aug 05 22:51:37 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 07 16:47:52 2013 -0700" }, "message": "ip_tunnel: embed hash list head\n\nThe IP tunnel hash heads can be embedded in the per-net structure\nsince it is a fixed size. Reduce the size so that the total structure\nfits in a page size. The original size was overly large, even NETDEV_HASHBITS\nis only 8 bits!\n\nAlso, add some white space for readability.\n\nSigned-off-by: Stephen Hemminger \u003cstephen@networkplumber.org\u003e\nAcked-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e.\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a139296f872d438f17f7219411321b603c1622b", "tree": "205c06b348c85194810033ec6f469f446ef385ab", "parents": [ "e7f63f1dc4bd643d9249c653e60c530d4a438147" ], "author": { "name": "fan.du", "email": "fan.du@windriver.com", "time": "Mon Aug 05 17:13:03 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 05 12:20:51 2013 -0700" }, "message": "sctp: Pack dst_cookie into 1st cacheline hole for 64bit host\n\nAs dst_cookie is used in fast path sctp_transport_dst_check.\n\nBefore:\nstruct sctp_transport {\n\tstruct list_head transports; /* 0 16 */\n\tatomic_t refcnt; /* 16 4 */\n\t__u32 dead:1; /* 20:31 4 */\n\t__u32 rto_pending:1; /* 20:30 4 */\n\t__u32 hb_sent:1; /* 20:29 4 */\n\t__u32 pmtu_pending:1; /* 20:28 4 */\n\n\t/* XXX 28 bits hole, try to pack */\n\n\t__u32 sack_generation; /* 24 4 */\n\n\t/* XXX 4 bytes hole, try to pack */\n\n\tstruct flowi fl; /* 32 64 */\n\t/* --- cacheline 1 boundary (64 bytes) was 32 bytes ago --- */\n\tunion sctp_addr ipaddr; /* 96 28 */\n\nAfter:\nstruct sctp_transport {\n\tstruct list_head transports; /* 0 16 */\n\tatomic_t refcnt; /* 16 4 */\n\t__u32 dead:1; /* 20:31 4 */\n\t__u32 rto_pending:1; /* 20:30 4 */\n\t__u32 hb_sent:1; /* 20:29 4 */\n\t__u32 pmtu_pending:1; /* 20:28 4 */\n\n\t/* XXX 28 bits hole, try to pack */\n\n\t__u32 sack_generation; /* 24 4 */\n\tu32 dst_cookie; /* 28 4 */\n\tstruct flowi fl; /* 32 64 */\n\t/* --- cacheline 1 boundary (64 bytes) was 32 bytes ago --- */\n\tunion sctp_addr ipaddr; /* 96 28 */\n\nSigned-off-by: Fan Du \u003cfan.du@windriver.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e473fcb472574de978e47f980aeca510020a1286", "tree": "3ff2448d30ed7aee77d04258d032712a09b37f8e", "parents": [ "5ca5461c3ee8b306c04ac833e5eacb5755b85d88" ], "author": { "name": "Mathias Krause", "email": "minipli@googlemail.com", "time": "Wed Jun 26 23:56:58 2013 +0200" }, "committer": { "name": "Steffen Klassert", "email": "steffen.klassert@secunet.com", "time": "Mon Aug 05 11:13:53 2013 +0200" }, "message": "xfrm: constify mark argument of xfrm_find_acq()\n\nThe mark argument is read only, so constify it. Also make dummy_mark in\naf_key const -- only used as dummy argument for this very function.\n\nSigned-off-by: Mathias Krause \u003cminipli@googlemail.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nSigned-off-by: Steffen Klassert \u003csteffen.klassert@secunet.com\u003e\n" }, { "commit": "bf37d2b3fdc9e451f9e376a3922ac8df5aa24128", "tree": "d773645ff3e9689f40ac6072c284eed178c2c154", "parents": [ "136d8f377e1575463b47840bc5f1b22d94bf8f63" ], "author": { "name": "Eliezer Tamir", "email": "eliezer.tamir@linux.intel.com", "time": "Sun Aug 04 12:55:48 2013 +0300" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 04 19:41:27 2013 -0700" }, "message": "busy_poll: cleanup do-nothing placeholders\n\nWhen renaming ll_poll to busy poll, I introduced a typo\nin the name of the do-nothing placeholder for sk_busy_loop\nand called it sk_busy_poll.\nThis broke compile when busy poll was not configured.\nCong Wang submitted a patch to fixed that.\nThis patch removes the now redundant, misspelled placeholder.\n\nSigned-off-by: Eliezer Tamir \u003celiezer.tamir@linux.intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0e76a3a587fc7abda2badf249053b427baad255e", "tree": "646a1da67dc25654552028225ca4b7a0a8043cc9", "parents": [ "fba3679d34511c42bf452e89dda457a1219eb43a", "72a67a94bcba71a5fddd6b3596a20604d2b5dcd6" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 03 21:36:46 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 03 21:36:46 2013 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nMerge net into net-next to setup some infrastructure Eric\nDumazet needs for usbnet changes.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fba3679d34511c42bf452e89dda457a1219eb43a", "tree": "e15630906314e3243c2053887bd1f32af8a40f2e", "parents": [ "73f5698e77219bfc3ea1903759fe8e20ab5b285e" ], "author": { "name": "Eric Dumazet", "email": "edumazet@google.com", "time": "Sat Aug 03 11:50:35 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 03 11:53:54 2013 -0700" }, "message": "fib_rules: reorder struct fib_rules fields\n\nMove refcnt, pref, suppress_ifgroup, suppress_prefixlen out of first\ncache line, as they are not used in fast path.\n\nMake sure ctarget \u0026 fr_net are in first cache line.\n\n(Assuming 64 bit arches and 64 bytes cache lines)\n\nSigned-off-by: Eric Dumazet \u003cedumazet@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "73f5698e77219bfc3ea1903759fe8e20ab5b285e", "tree": "f3b64e87cc6ce4d7749ddfd9e993421b0c53a02c", "parents": [ "0c0667a8548ef2985038a5a1d0fa0f64e2774694" ], "author": { "name": "Stefan Tomanek", "email": "stefan.tomanek@wertarbyte.de", "time": "Sat Aug 03 14:14:43 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 03 10:40:23 2013 -0700" }, "message": "fib_rules: fix suppressor names and default values\n\nThis change brings the suppressor attribute names into line; it also changes\nthe data types to provide a more consistent interface.\n\nWhile -1 indicates that the suppressor is not enabled, values \u003e\u003d 0 for\nsuppress_prefixlen or suppress_ifgroup reject routing decisions violating the\nconstraint.\n\nThis changes the previously presented behaviour of suppress_prefixlen, where a\nprefix length _less_ than the attribute value was rejected. After this change,\na prefix length less than *or* equal to the value is considered a violation of\nthe rule constraint.\n\nIt also changes the default values for default and newly added rules (disabling\nany suppression for those).\n\nSigned-off-by: Stefan Tomanek \u003cstefan.tomanek@wertarbyte.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ef94cfafba159d6b1a902ccb3349ac6a34ff6ad", "tree": "f2d7afebf4534ea50273165f4b0798aed704a37c", "parents": [ "d1c53c8e870cdedb6fc9550f41c558bab45b5219" ], "author": { "name": "Stefan Tomanek", "email": "stefan.tomanek@wertarbyte.de", "time": "Fri Aug 02 17:19:56 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 02 15:24:22 2013 -0700" }, "message": "fib_rules: add route suppression based on ifgroup\n\nThis change adds the ability to suppress a routing decision based upon the\ninterface group the selected interface belongs to. This allows it to\nexclude specific devices from a routing decision.\n\nSigned-off-by: Stefan Tomanek \u003cstefan.tomanek@wertarbyte.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d27fc78208b53ccdfd6a57d4ac44a459ca66806f", "tree": "700f653b85cac0da64bdcbfb86021a4da07cd3d9", "parents": [ "ba5082c71476891623757956ebfc36040ac317e2" ], "author": { "name": "fan.du", "email": "fan.du@windriver.com", "time": "Fri Aug 02 10:45:13 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 02 12:36:00 2013 -0700" }, "message": "sctp: Don\u0027t lookup dst if transport dst is still valid\n\nWhen sctp sits on IPv6, sctp_transport_dst_check pass cookie as ZERO,\nas a result ip6_dst_check always fail out. This behaviour makes\ntransport-\u003edst useless, because every sctp_packet_transmit must look\nfor valid dst.\n\nAdd a dst_cookie into sctp_transport, and set the cookie whenever we\nget new dst for sctp_transport. So dst validness could be checked\nagainst it.\n\nSince I have split genid for IPv4 and IPv6, also delete/add IPv6 address\nwill also bump IPv6 genid. So issues we discussed in:\nhttp://marc.info/?l\u003dlinux-netdev\u0026m\u003d137404469219410\u0026w\u003d4\nhave all been sloved for this patch.\n\nSigned-off-by: Fan Du \u003cfan.du@windriver.com\u003e\nAcked-by: Vlad Yasevich \u003cvyasevich@gmail.com\u003e\nAcked-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "574e2af7c0af3273836def5e66f236521bb433c9", "tree": "5cfa1b92c82a86426a906ee9203a1548f0e3d993", "parents": [ "e216975ad97cfcfc436789aa66d59a0e93f337f7" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Thu Aug 01 16:17:48 2013 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 02 12:33:54 2013 -0700" }, "message": "include: Convert ethernet mac address declarations to use ETH_ALEN\n\nIt\u0027s convenient to have ethernet mac addresses use\nETH_ALEN to be able to grep for them a bit easier and\nalso to ensure that the addresses are __aligned(2).\n\nAdd #include \u003clinux/if_ether.h\u003e as necessary.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Mauro Carvalho Chehab \u003cm.chehab@samsung.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e0d1095ae3405404d247afb00233ef837d58da83", "tree": "1f83aed50dbe9298ca0cdc5a0d51a3750f0fd720", "parents": [ "dfcefb0be1231982784df2152213103ad33c1cfd" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Thu Aug 01 11:10:25 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 01 15:11:17 2013 -0700" }, "message": "net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL\n\nEliezer renames several *ll_poll to *busy_poll, but forgets\nCONFIG_NET_LL_RX_POLL, so in case of confusion, rename it too.\n\nCc: Eliezer Tamir \u003celiezer.tamir@linux.intel.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dfcefb0be1231982784df2152213103ad33c1cfd", "tree": "70dc6ca20c23745ce7bee67cbe5b1c9e2dd13032", "parents": [ "b30513202c6c14120f70b2e9aa1e97d47bbc2313" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Thu Aug 01 11:10:24 2013 +0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 01 15:10:58 2013 -0700" }, "message": "net: fix a compile error when CONFIG_NET_LL_RX_POLL is not set\n\nWhen CONFIG_NET_LL_RX_POLL is not set, I got:\n\nnet/socket.c: In function ‘sock_poll’:\nnet/socket.c:1165:4: error: implicit declaration of function ‘sk_busy_loop’ [-Werror\u003dimplicit-function-declaration]\n\nFix this by adding a nop when !CONFIG_NET_LL_RX_POLL.\n\nCc: Eliezer Tamir \u003celiezer.tamir@linux.intel.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2ac3ac8f86f2fe065d746d9a9abaca867adec577", "tree": "6d0513fcc4e048797a417174a667b7c562535ddb", "parents": [ "1f1059fcf0b30deb1cf1e23af9ef4231c0bcc0bb" ], "author": { "name": "Michal Kubeček", "email": "mkubecek@suse.cz", "time": "Thu Aug 01 10:04:14 2013 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 01 14:16:20 2013 -0700" }, "message": "ipv6: prevent fib6_run_gc() contention\n\nOn a high-traffic router with many processors and many IPv6 dst\nentries, soft lockup in fib6_run_gc() can occur when number of\nentries reaches gc_thresh.\n\nThis happens because fib6_run_gc() uses fib6_gc_lock to allow\nonly one thread to run the garbage collector but ip6_dst_gc()\ndoesn\u0027t update net-\u003eipv6.ip6_rt_last_gc until fib6_run_gc()\nreturns. On a system with many entries, this can take some time\nso that in the meantime, other threads pass the tests in\nip6_dst_gc() (ip6_rt_last_gc is still not updated) and wait for\nthe lock. They then have to run the garbage collector one after\nanother which blocks them for quite long.\n\nResolve this by replacing special value ~0UL of expire parameter\nto fib6_run_gc() by explicit \"force\" parameter to choose between\nspin_lock_bh() and spin_trylock_bh() and call fib6_run_gc() with\nforce\u003dfalse if gc_thresh is reached but not max_size.\n\nSigned-off-by: Michal Kubecek \u003cmkubecek@suse.cz\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22e02a0272e5291a40ca28d2b7aea5231c832077", "tree": "04630aa6452458c643a3af6fd2c296609beef2c6", "parents": [ "b00589af3b04736376f24625ab0b394642e89e29", "11a45820d02ee78ad22bb95d5abb94950a355d8d" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 01 14:30:59 2013 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 01 14:30:59 2013 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" } ], "next": "73da7d5bab79ad7e16ff44d67c3fe8b9c0b33e5b" }