)]}' { "log": [ { "commit": "38e5781bbf8e82c1635ea845e0d07b2228a5ac7a", "tree": "69ced9c509c864a67122c5e1337f14cd1d9e988d", "parents": [ "979ecef5b89a8003902299566d9cdc08de34a3ee", "a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:46:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:46:52 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:\n igmp: Avoid zero delay when receiving odd mixture of IGMP queries\n netdev: make net_device_ops const\n bcm63xx: make ethtool_ops const\n usbnet: make ethtool_ops const\n net: Fix build with INET disabled.\n net: introduce netif_addr_lock_nested() and call if when appropriate\n net: correct lock name in dev_[uc/mc]_sync documentations.\n net: sk_update_clone is only used in net/core/sock.c\n 8139cp: fix missing napi_gro_flush.\n pktgen: set correct max and min in pktgen_setup_inject()\n smsc911x: Unconditionally include linux/smscphy.h in smsc911x.h\n asix: fix infinite loop in rx_fixup()\n net: Default UDP and UNIX diag to \u0027n\u0027.\n r6040: fix typo in use of MCR0 register bits\n net: fix sock_clone reference mismatch with tcp memcontrol\n" }, { "commit": "a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27", "tree": "8e1ac7654905142f37d74d8e3e376325a5eb48b1", "parents": [ "e5686ad82ca2aeed7a8f24ffca115c0b7478dec9" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Mon Jan 09 14:06:46 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 14:06:46 2012 -0800" }, "message": "igmp: Avoid zero delay when receiving odd mixture of IGMP queries\n\nCommit 5b7c84066733c5dfb0e4016d939757b38de189e4 (\u0027ipv4: correct IGMP\nbehavior on v3 query during v2-compatibility mode\u0027) added yet another\ncase for query parsing, which can result in max_delay \u003d 0. Substitute\na value of 1, as in the usual v3 case.\n\nReported-by: Simon McVittie \u003csmcv@debian.org\u003e\nReferences: http://bugs.debian.org/654876\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3969eb3859e4fad4b32ca8f96d4ec8551c20704a", "tree": "06620d8c94d92ab187f6ce8e72f2d0453d734314", "parents": [ "2429f7ac2ef429378536d87fcbbf6f424aa5b47f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 13:44:23 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 13:44:23 2012 -0800" }, "message": "net: Fix build with INET disabled.\n\n\u003e net/core/sock.c: In function \u0027sk_update_clone\u0027:\n\u003e net/core/sock.c:1278:3: error: implicit declaration of function \u0027sock_update_memcg\u0027\n\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5", "tree": "33e64fc453619978c3ecc86c7ec3649db3b4d8dc", "parents": [ "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "933393f58fef9963eac61db8093689544e29a600" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 13:08:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 13:08:28 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:\n percpu: Remove irqsafe_cpu_xxx variants\n\nFix up conflict in arch/x86/include/asm/percpu.h due to clash with\ncebef5beed3d (\"x86: Fix and improve percpu_cmpxchg{8,16}b_double()\")\nwhich edited the (now removed) irqsafe_cpu_cmpxchg*_double code.\n" }, { "commit": "2429f7ac2ef429378536d87fcbbf6f424aa5b47f", "tree": "15e0fd0c42f6e10ede9f1cf84553c2a01e593d81", "parents": [ "ab16ebf375f0513d6b0f5193de84186a3fc0c33b" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Jan 09 06:36:54 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 12:46:58 2012 -0800" }, "message": "net: introduce netif_addr_lock_nested() and call if when appropriate\n\ndev_uc_sync() and dev_mc_sync() are acquiring netif_addr_lock for\ndestination device of synchronization. Since netif_addr_lock is\nalready held at the time for source device, this triggers lockdep\ndeadlock warning.\n\nThere\u0027s no way this deadlock can happen so use spin_lock_nested() to\nsilence the warning.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ab16ebf375f0513d6b0f5193de84186a3fc0c33b", "tree": "5f4581eac2a8a155a7dc41be0ea47e0c35761f2c", "parents": [ "475f1b52645a29936b9df1d8fcd45f7e56bd4a9f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Jan 09 06:18:34 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 09 12:46:58 2012 -0800" }, "message": "net: correct lock name in dev_[uc/mc]_sync documentations.\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "475f1b52645a29936b9df1d8fcd45f7e56bd4a9f", "tree": "d0f9641f2f0ac6263b3c1ef4e8dfe8baf2602dd7", "parents": [ "b189e810619a676e6b931a942a3e8387f3d39c21" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Mon Jan 09 16:33:16 2012 +1100" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 08 23:44:26 2012 -0800" }, "message": "net: sk_update_clone is only used in net/core/sock.c\n\nso move it there. Fixes build errors when CONFIG_INET is not defined:\n\nIn file included from include/linux/tcp.h:211:0,\n from include/linux/ipv6.h:221,\n from include/net/ipv6.h:16,\n from include/linux/sunrpc/clnt.h:26,\n from include/linux/nfs_fs.h:50,\n from init/do_mounts.c:20:\ninclude/net/sock.h: In function \u0027sk_update_clone\u0027:\ninclude/net/sock.h:1109:3: error: implicit declaration of function \u0027sock_update_memcg\u0027 [-Werror\u003dimplicit-function-declaration]\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "26e29eeda048aa6699984c4b9d6997dd1a1315db", "tree": "eeef1467c079ce2f3470163d5151b35b7e733fb5", "parents": [ "96dab45fc3eb732de7b7fe03d2250d3815af8929" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Fri Jan 06 03:13:47 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 07 12:26:08 2012 -0800" }, "message": "pktgen: set correct max and min in pktgen_setup_inject()\n\nIn 882716604ec \"pktgen: fix multiple queue warning\" we added special\nlogic to handle the case where ntxq is zero. It\u0027s not clear to me that\nntxq can actually be zero. But if it were then we would set\n-\u003equeue_map_min and -\u003equeue_map_max to USHRT_MAX when probably we want\nto set them to zero?\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6d62a66e4211546f9e5c5d1ad586749a51cf30db", "tree": "3d258aa96a35435ec4a372a9ffe016161a66db8e", "parents": [ "77e1e438cbb1b8f9b7a3bb2d4f0264d1dd952d75" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 07 12:13:06 2012 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 07 12:13:06 2012 -0800" }, "message": "net: Default UDP and UNIX diag to \u0027n\u0027.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f3f511e1ce6f1a6f0a5bb8320e9f802e76f6b999", "tree": "bedb8b38bec1bdb3fa7159bc61822488984d3ce0", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Thu Jan 05 20:16:39 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jan 07 10:16:34 2012 -0800" }, "message": "net: fix sock_clone reference mismatch with tcp memcontrol\n\nSockets can also be created through sock_clone. Because it copies\nall data in the sock structure, it also copies the memcg-related pointer,\nand all should be fine. However, since we now use reference counts in\nsocket creation, we are left with some sockets that have no reference\ncounts. It matters when we destroy them, since it leads to a mismatch.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: Greg Thelen \u003cgthelen@google.com\u003e\nCC: Hiroyouki Kamezawa \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCC: Laurent Chavey \u003cchavey@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "tree": "c017a1b4a70b8447c71b01d8b320e071546b5c9d", "parents": [ "edf7c8148ec40c0fd27c0ef3f688defcc65e3913", "9f42f126154786e6e76df513004800c8c633f020" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits)\n net: pack skb_shared_info more efficiently\n net_sched: red: split red_parms into parms and vars\n net_sched: sfq: extend limits\n cnic: Improve error recovery on bnx2x devices\n cnic: Re-init dev-\u003estats_addr after chip reset\n net_sched: Bug in netem reordering\n bna: fix sparse warnings/errors\n bna: make ethtool_ops and strings const\n xgmac: cleanups\n net: make ethtool_ops const\n vmxnet3\" make ethtool ops const\n xen-netback: make ops structs const\n virtio_net: Pass gfp flags when allocating rx buffers.\n ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call\n netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call\n igb: reset PHY after recovering from PHY power down\n igb: add basic runtime PM support\n igb: Add support for byte queue limits.\n e1000: cleanup CE4100 MDIO registers access\n e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove\n ...\n" }, { "commit": "07d106d0a33d6063d2061305903deb02489eba20", "tree": "6f257f877a9c2e653ca0515253e930fa6606239a", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 05 15:40:12 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 05 15:40:12 2012 -0800" }, "message": "vfs: fix up ENOIOCTLCMD error handling\n\nWe\u0027re doing some odd things there, which already messes up various users\n(see the net/socket.c code that this removes), and it was going to add\nyet more crud to the block layer because of the incorrect error code\ntranslation.\n\nENOIOCTLCMD is not an error return that should be returned to user mode\nfrom the \"ioctl()\" system call, but it should *not* be translated as\nEINVAL (\"Invalid argument\"). It should be translated as ENOTTY\n(\"Inappropriate ioctl for device\").\n\nThat EINVAL confusion has apparently so permeated some code that the\nblock layer actually checks for it, which is sad. We continue to do so\nfor now, but add a big comment about how wrong that is, and we should\nremove it entirely eventually. In the meantime, this tries to keep the\nchanges localized to just the EINVAL -\u003e ENOTTY fix, and removing code\nthat makes it harder to do the right thing.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eeca6688d6599c28bc449a45facb67d7f203be74", "tree": "5cabbf24a3c1ee2d7757c873ba6449296a8ef7b7", "parents": [ "18cb809850fb499ad9bf288696a95f4071f73931" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jan 05 02:25:16 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 05 14:01:21 2012 -0500" }, "message": "net_sched: red: split red_parms into parms and vars\n\nThis patch splits the red_parms structure into two components.\n\nOne holding the RED \u0027constant\u0027 parameters, and one containing the\nvariables.\n\nThis permits a size reduction of GRED qdisc, and is a preliminary step\nto add an optional RED unit to SFQ.\n\nSFQRED will have a single red_parms structure shared by all flows, and a\nprivate red_vars per flow.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Dave Taht \u003cdave.taht@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "18cb809850fb499ad9bf288696a95f4071f73931", "tree": "6f6c7c836176385baf0f185b6f5b4092e9ac1fdf", "parents": [ "23021c21055f88a428b6deb6f803fa0d659e023f" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 04 14:18:38 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 05 14:01:21 2012 -0500" }, "message": "net_sched: sfq: extend limits\n\nSFQ as implemented in Linux is very limited, with at most 127 flows\nand limit of 127 packets. [ So if 127 flows are active, we have one\npacket per flow ]\n\nThis patch brings to SFQ following features to cope with modern needs.\n\n- Ability to specify a smaller per flow limit of inflight packets.\n (default value being at 127 packets)\n\n- Ability to have up to 65408 active flows (instead of 127)\n\n- Ability to have head drops instead of tail drops\n (to drop old packets from a flow)\n\nExample of use : No more than 20 packets per flow, max 8000 flows, max\n20000 packets in SFQ qdisc, hash table of 65536 slots.\n\ntc qdisc add ... sfq \\\n flows 8000 \\\n depth 20 \\\n headdrop \\\n limit 20000 \\\n\tdivisor 65536\n\nRam usage :\n\n2 bytes per hash table entry (instead of previous 1 byte/entry)\n32 bytes per flow on 64bit arches, instead of 384 for QFQ, so much\nbetter cache hit ratio.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Dave Taht \u003cdave.taht@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb10192447370f19a215a8c2749332afa1199d46", "tree": "3c29d462ed3bc3b6c7af1492ca66395d2f0c5d42", "parents": [ "e1e0918fcaea7b8100ed9f96f3ecd9eb9b867102" ], "author": { "name": "Hagen Paul Pfeifer", "email": "hagen@jauu.net", "time": "Wed Jan 04 17:35:26 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 05 13:27:39 2012 -0500" }, "message": "net_sched: Bug in netem reordering\n\nNot now, but it looks you are correct. q-\u003eqdisc is NULL until another\nadditional qdisc is attached (beside tfifo). See 50612537e9ab2969312.\nThe following patch should work.\n\nFrom: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\n\nnetem: catch NULL pointer by updating the real qdisc statistic\n\nReported-by: Vijay Subramanian \u003csubramanian.vijay@gmail.com\u003e\nSigned-off-by: Hagen Paul Pfeifer \u003chagen@jauu.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1032c736e81cdf490ae62f86da7efe67c3c3e61d", "tree": "a0c3919849f97dbbc5ea7c6a9ac1d7a639e44a73", "parents": [ "117ff42fd43e92d24c6aa6f3e4f0f1e1edada140", "cb00ec382b57d35b955c085198cd54a0c1fcdc94" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jan 05 10:12:45 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jan 05 10:13:24 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tdrivers/net/wireless/b43legacy/dma.c\n" }, { "commit": "117ff42fd43e92d24c6aa6f3e4f0f1e1edada140", "tree": "c08e1c0357fde481a16489b77feb8f6073faf538", "parents": [ "1d5783030a14d1b6ee763f63c8136e581f48b365", "805a6af8dba5dfdd35ec35dc52ec0122400b2610" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 21:35:43 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 21:35:43 2012 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "1d5783030a14d1b6ee763f63c8136e581f48b365", "tree": "c17e33ce9a8dae357a653d2f56621369128a9d36", "parents": [ "48529680dc59061eaa13ea3b1047401612b79600" ], "author": { "name": "Mihai Maruseac", "email": "mihai.maruseac@gmail.com", "time": "Tue Jan 03 23:31:35 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 16:00:57 2012 -0500" }, "message": "ipv6/addrconf: speedup /proc/net/if_inet6 filling\n\nThis ensures a linear behaviour when filling /proc/net/if_inet6 thus making\nifconfig run really fast on IPv6 only addresses. In fact, with this patch and\nthe IPv4 one sent a while ago, ifconfig will run in linear time regardless of\naddress type.\n\nIPv4 related patch: f04565ddf52e401880f8ba51de0dff8ba51c99fd\n\t dev: use name hash for dev_seq_ops\n\t ...\n\nSome statistics (running ifconfig \u003e /dev/null on a different setup):\n\niface count / IPv6 no-patch time / IPv6 patched time / IPv4 time\n----------------------------------------------------------------\n 6250 | 0.23 s | 0.13 s | 0.11 s\n 12500 | 0.62 s | 0.28 s | 0.22 s\n 25000 | 2.91 s | 0.57 s | 0.46 s\n 50000 | 11.37 s | 1.21 s | 0.94 s\n 128000 | 86.78 s | 3.05 s | 2.54 s\n\nSigned-off-by: Mihai Maruseac \u003cmmaruseac@ixiacom.com\u003e\nCc: Daniel Baluta \u003cdbaluta@ixiacom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e6bff995f8fe78f74cbe8f14bf6a31f3560b9ce4", "tree": "6f3dd815508bd265c9d272bea1a1e0300e09bef3", "parents": [ "02a9098ede0dc7e28c16a03fa7fba86a05219478" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Wed Jan 04 10:49:15 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 15:53:20 2012 -0500" }, "message": "ipv6: Check RA for sllao when configuring optimistic ipv6 address (v2)\n\nRecently Dave noticed that a test we did in ipv6_add_addr to see if we next hop\nroute for the interface we\u0027re adding an addres to was wrong (see commit\n7ffbcecbeed91e5874e9a1cfc4c0cbb07dac3069). for one, it never triggers, and two,\nit was completely wrong to begin with. This test was meant to cover this\nsection of RFC 4429:\n\n3.3 Modifications to RFC 2462 Stateless Address Autoconfiguration\n\n * (modifies section 5.5) A host MAY choose to configure a new address\n as an Optimistic Address. A host that does not know the SLLAO\n of its router SHOULD NOT configure a new address as Optimistic.\n A router SHOULD NOT configure an Optimistic Address.\n\nThis patch should bring us into proper compliance with the above clause. Since\nwe only add a SLAAC address after we\u0027ve received a RA which may or may not\ncontain a source link layer address option, we can pass a pointer to that option\nto addrconf_prefix_rcv (which may be null if the option is not present), and\nonly set the optimistic flag if the option was found in the RA.\n\nChange notes:\n(v2) modified the new parameter to addrconf_prefix_rcv to be a bool rather than\na pointer to make its use more clear as per request from davem.\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "67f61261b6df33a9aee8a6e014b4aef661f1a532", "tree": "66ecd468a7cb5cb067fa3f9cae4a14cfc5305e9e", "parents": [ "6b6accc3832e5a124eeb144c6b3b1ff65b503d2b" ], "author": { "name": "Mohammed Shafi Shajakhan", "email": "mohammed@qca.qualcomm.com", "time": "Fri Dec 30 16:49:01 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:31:47 2012 -0500" }, "message": "mac80211: remove dead code\n\nieee80211_offchannel_enable_all_ps function is no longer used\nand looks like its logic is extensively handled in\nieee80211_offchannel_stop_vifs\n\nSigned-off-by: Mohammed Shafi Shajakhan \u003cmohammed@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7f28197560116f08c4c27342974f9e64cab2cbb1", "tree": "6d66241d34a6f5a7825d8a00839e940146a33c54", "parents": [ "98f0a5eb02bbfff662664bf65f469dc4abd701fd" ], "author": { "name": "Yogesh Ashok Powar", "email": "yogeshp@marvell.com", "time": "Fri Dec 30 16:34:25 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:31:46 2012 -0500" }, "message": "mac80211: Call driver commands after drv_start in mac80211 restart code\n\nIdeally, hardware/firmware initialization is complete after the\ndrv_start routine. In mac80211 restart code (ieee80211_reconfig),\ndefer calling the driver commands i.e. setup fragmentation\nthreshold, rts threshold and coverage class till drv_start\nroutine is called.\n\nSigned-off-by: Nishant Sarmukadam \u003cnishants@marvell.com\u003e\nSigned-off-by: Yogesh Ashok Powar \u003cyogeshp@marvell.com\u003e\n\nv2: Removed extra blank line added.\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "30fa904724b9c7737264e2eada7f16afc8deee79", "tree": "988c7a3d0cf4af3e454c1e244be2f555d4dc55c5", "parents": [ "f961e34ebef84b532ec6c477f73b66d9a8b0ddbc" ], "author": { "name": "Mohammed Shafi Shajakhan", "email": "mohammed@qca.qualcomm.com", "time": "Tue Dec 27 18:54:07 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:46 2012 -0500" }, "message": "mac80211: use RCU read locks for sta_info_get\n\nthis is being recently introduced by the commit\na85e1d55974646a442d95911e3f7d7a891ea9ac5\n\nCc: Paul Stewart \u003cpstew@google.com\u003e\nSigned-off-by: Mohammed Shafi Shajakhan \u003cmohammed@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e46a2cf9e1dea9267e8a3f5284aea908e5aac5c6", "tree": "91e96ab4322f024f7bb995424c8ca8c8b647026f", "parents": [ "de2ee84db6a0201278e35590821cd014cb71830a" ], "author": { "name": "Mohammed Shafi Shajakhan", "email": "mohammed@qca.qualcomm.com", "time": "Mon Dec 26 10:43:29 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:46 2012 -0500" }, "message": "mac80211: fix kernel panic in IBSS due to a regression\n\nkernel panic occurs when we create an IBSS mode and leave it for\nsometime without any joiner and this is introduced by the\ncommit ec2b774e7c91094d8c00de579646f1162b87b01e where we don\u0027t\nput proper braces for \u0027list_for_each_entry_safe\u0027 and we pass an\ninvalid \u0027sta\u0027 pointer to __sta_info_destroy\n\nEIP is at __list_add+0xe/0xa0\nEAX: f3b63db4 EBX: 00000000 ECX: eab88c1c EDX: 00000000\nESI: 00000000 EDI: 00000246 EBP: f3b63d80 ESP: f3b63d58\nDS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068\nProcess kworker/u:2 (pid: 198, ti\u003df3b62000 task\u003df3afbea0\ntask.ti\u003df3b62000)\nStack:\n00000000 00000000 f9ef9821 00000000 00000000 eab88c30\nf3b63d80 c017f623\neab88bf0 eab88bf0 f3b63dd0 c066f925 00000000 00000002\n00000000 f9ef9821\nf3b63da0 c0180a2b eab88c1c eab88c30 00000002 f3afbea0\neab88bf4 f3b63db4\n Call Trace:\n[\u003cf9ef9821\u003e] ? __ieee80211_stop_tx_ba_session+0x31/0x60\n[mac80211]\n[\u003cc017f623\u003e] ? debug_mutex_add_waiter+0x23/0x60\n[\u003cc066f925\u003e] __mutex_lock_common+0xd5/0x390\n[\u003cf9ef9821\u003e] ? __ieee80211_stop_tx_ba_session+0x31/0x60\n[mac80211]\n[\u003cc0180a2b\u003e] ? trace_hardirqs_off+0xb/0x10\n[\u003cc066fd37\u003e] mutex_lock_nested+0x47/0x60\n[\u003cf9ef9821\u003e] ? __ieee80211_stop_tx_ba_session+0x31/0x60\n[mac80211]\n[\u003cf9ef9821\u003e] __ieee80211_stop_tx_ba_session+0x31/0x60\n[mac80211]\n[\u003cf9ef8989\u003e] ieee80211_sta_tear_down_BA_sessions+0x39/0x60 [mac80211]\n[\u003cf9ef1a67\u003e] __sta_info_destroy+0x57/0x780 [mac80211]\n[\u003cf9ef2223\u003e] ieee80211_sta_expire+0x93/0xb0 [mac80211]\n[\u003cf9efc8f6\u003e] ieee80211_ibss_work+0x2d6/0x530 [mac80211]\n\nCc: Marek Lindner \u003clindner_marek@yahoo.de\u003e\nSigned-off-by: Mohammed Shafi Shajakhan \u003cmohammed@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "de2ee84db6a0201278e35590821cd014cb71830a", "tree": "61dea10ef4c3910a879c4cb09122b824b94876eb", "parents": [ "841f1d92fb8ca6aa70b56003d1da8874c593e820" ], "author": { "name": "Mohammed Shafi Shajakhan", "email": "mohammed@qca.qualcomm.com", "time": "Sat Dec 24 18:43:28 2011 +0530" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:46 2012 -0500" }, "message": "mac80211: fix scan state machine\n\nwhen we run high bandwidth UDP traffic and we trigger a scan, the scan\nstate machine seems to be looping in SUSPEND-\u003eRESUME-\u003eDECISION-\u003eSUSPEND\nand SET_CHANNEL seems to be never called as \u0027tx_empty\u0027 is never true\nwhile running UDP traffic. fix this by settting SET_CHANNEL state when\nwe get into RESUME state.\n\nCc: Leela Kella \u003cleela@qca.qualcomm.com\u003e\nSigned-off-by: Mohammed Shafi Shajakhan \u003cmohammed@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "841f1d92fb8ca6aa70b56003d1da8874c593e820", "tree": "c161f16d86525f4256253045c01307c329d3e4da", "parents": [ "016c2177918301c9a2557c675c12ab88667a27bb" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri Dec 23 18:39:27 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:46 2012 -0500" }, "message": "net/rfkill/rfkill-gpio.c: introduce missing kfree\n\nError handling code following a kmalloc should free the allocated data.\nThe label fail_alloc already does this for rfkill.\n\nA simplified version of the semantic match that finds the problem is as\nfollows: (http://coccinelle.lip6.fr)\n\n// \u003csmpl\u003e\n@r exists@\nlocal idexpression x;\nstatement S;\nidentifier f1;\nposition p1,p2;\nexpression *ptr !\u003d NULL;\n@@\n\nx@p1 \u003d \\(kmalloc\\|kzalloc\\|kcalloc\\)(...);\n...\nif (x \u003d\u003d NULL) S\n\u003c... when !\u003d x\n when !\u003d if (...) { \u003c+...x...+\u003e }\nx-\u003ef1\n...\u003e\n(\n return \\(0\\|\u003c+...x...+\u003e\\|ptr\\);\n|\n return@p2 ...;\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nprint \"* file: %s kmalloc %s return %s\" % (p1[0].file,p1[0].line,p2[0].line)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "f6e8cb72ad4b0381d79df4575ec1f5c5df2e73b9", "tree": "83ebc7844b19211de72a89e54596bc656816dace", "parents": [ "b156579b1404871d97d2713c1f93c9526618e3ba" ], "author": { "name": "Eliad Peller", "email": "eliad@wizery.com", "time": "Fri Dec 23 01:48:06 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:43 2012 -0500" }, "message": "mac80211: always clear SDATA_STATE_OFFCHANNEL flag\n\nIf the vif is stopped while it is offchannel (e.g. right\nafter p2p negotiation) the SDATA_STATE_OFFCHANNEL flag\nis never get cleared, resulting in various bad effects\n(e.g. GO can\u0027t start beaconing).\n\nFix it by clearing the SDATA_STATE_OFFCHANNEL flag\neven if the vif is stopped.\n\nSigned-off-by: Eliad Peller \u003celiad@wizery.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "b156579b1404871d97d2713c1f93c9526618e3ba", "tree": "c2665f99df8088555b3126c0d2f51c8fa02e303f", "parents": [ "288e0713f469c03dbc412153b5341d6dfc2c9907" ], "author": { "name": "Dave Täht", "email": "dave.taht@bufferbloat.net", "time": "Thu Dec 22 12:55:08 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:43 2012 -0500" }, "message": "wireless: Treat IPv6 diffserv the same as IPv4 for 802.11e\n\nWireless will select a different hardware queue based on the\ntop 3 bits of the diffserv field, for ipv4. Extend that queue\nselection mechanism to ipv6, and make the calls orthogonal.\n\nSigned-off-by: Dave Täht \u003cdave.taht@bufferbloat.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "288e0713f469c03dbc412153b5341d6dfc2c9907", "tree": "1155f2d96309acb17a23d4a384417c5de3940647", "parents": [ "9931df2692ddb7db092550ce063e674730176ecf" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Thu Dec 22 11:51:54 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:43 2012 -0500" }, "message": "NFC: Export a new attribute nfcid1 in target info\n\nThe nfcid1 is the NFC-A identifier.\nIt is exported as an attribute of the target info\n(returned as a response to NFC_CMD_GET_TARGET).\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nAcked-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3b77d5ec0c86b8a9594217ff9024b00e4d1c5795", "tree": "0285efd9f6ddad992322b040f420714e78c6d94f", "parents": [ "6653325a556ef5a838ed7d3a0a6552f0efc72739" ], "author": { "name": "Luis R. Rodriguez", "email": "mcgrof@qca.qualcomm.com", "time": "Tue Dec 20 12:23:38 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:41 2012 -0500" }, "message": "cfg80211: relicense reg.c reg.h and genregdb.awk to ISC\n\nFollowing the tradition we have had with ath5k, ath9k, CRDA,\nwireless-regdb I\u0027d like to license this code under the permissive ISC\nlicense for the code sharing purposes with other OSes, it\u0027d sure be nice\nto help the landscape in this area. Although I am %82.89 owner of the\nregulatory code I have asked every contributor to the regulatory code\nand have receieved positive Acked-bys from everyone except two deceased\nentities:\n\n o Frans Pop RIP 2010 [0]\n\t- Frans Pop \u003celendil@planet.nl\u003e\n\t- Frans Pop \u003cfjp@debian.org\u003e\n o Nokia RIP February, 11, 2011 [1], [2]\n\t- ext-yuri.ershov@nokia.com\n\t- kalle.valo@nokia.com\n\nFrans Pop\u0027s contribution was a simple patch 55f98938, titled,\n\"wireless: remove trailing space in messages\" which just add a \\n\nto some printk lines. I\u0027m going to treat these additions as\nuncopyrightable.\n\nAs for the contributions made by employees on behalf of Nokia\nmy contact point was Petri Karhula \u003cpetri.karhula@nokia.com\u003e but\nafter one month he noted he had not been able to get traction from the\nlegal department on this request, as such it I proceeded by replacing\ntheir contributions in previous patches.\n\nThe end goal is to help a clean rewrite that starts in userspace\nthat is shared under ISC license which currently is taking place with\nthe regulatory simulator [3].\n\n[0] http://lists.debian.org/debian-devel/2011/12/msg00263.html\n[1] http://press.nokia.com/2011/02/11/nokia-outlines-new-strategy-introduces-new-leadership-operational-structure/\n[2] http://NokiaPlanB.com\n[3] git://github.com/mcgrof/regsim.git\n\nAcked-by: Thadeu Lima de Souza Cascardo \u003ccascardo@holoscopio.com\u003e\nAcked-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Mihai Moldovan \u003cionic@ionic.de\u003e\nAcked-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nAcked-by: Sven Neumann \u003cs.neumann@raumfeld.com\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nAcked-by: Tomas Winkler \u003ctomas.winkler@intel.com\u003e\nAcked-by: Tony Vroon \u003ctony@linx.net\u003e\nAcked-by: Pavel Roskin \u003cproski@gnu.org\u003e\nAcked-by: Bob Copeland \u003cme@bobcopeland.com\u003e\nAcked-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\nAcked-by: Pat Erley \u003cpat-lkml@erley.org\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: John W. Linville \u003clinville@tuxdriver.com\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nAcked-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nAcked-by: John Gordon \u003cjohn@devicescape.com\u003e\nAcked-by: Simon Barber \u003cprotocolmagic@gmail.com\u003e\nAcked-by: Rajkumar Manoharan \u003crmanohar@qca.qualcomm.com\u003e\nAcked-by: Jiri Benc \u003cjbenc@upir.cz\u003e\nAcked-by: Bruno Randolf \u003cbr1@einfach.org\u003e\nAcked-by: Scott James Remnant \u003ckeybuk@google.com\u003e\nAcked-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Luis R. Rodriguez \u003cmcgrof@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "6653325a556ef5a838ed7d3a0a6552f0efc72739", "tree": "c1e927673a6b6b394166684c6e798619685c9fb6", "parents": [ "8848bef0382af53a7c9568bbc6757db97c53a0e3" ], "author": { "name": "Luis R. Rodriguez", "email": "mcgrof@qca.qualcomm.com", "time": "Tue Dec 20 12:23:37 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:40 2012 -0500" }, "message": "cfg80211: replace reg.c Nokia commit 269ac5\n\nNokia hasn\u0027t gotten back to me in over 1 month for a relicense\nchange request. There are only a few changes that they contributed,\nso just reverting their changes but replacing with another set.\nThis change replaces this commit:\n\ncommit 269ac5fd2d75b118d76a2291e28796527db2f3f8\nAuthor: Kalle Valo \u003ckalle.valo@nokia.com\u003e\nDate: Tue Dec 1 10:47:15 2009 +0200\n\n cfg80211: indent regulatory messages with spaces\n\n The regulatory messages in syslog look weird:\n\n kernel: cfg80211: Regulatory domain: US\n kernel: ^I(start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp)\n kernel: ^I(2402000 KHz - 2472000 KHz @ 40000 KHz), (600 mBi, 2700 mBm)\n kernel: ^I(5170000 KHz - 5190000 KHz @ 40000 KHz), (600 mBi, 2300 mBm)\n kernel: ^I(5190000 KHz - 5210000 KHz @ 40000 KHz), (600 mBi, 2300 mBm)\n kernel: ^I(5210000 KHz - 5230000 KHz @ 40000 KHz), (600 mBi, 2300 mBm)\n kernel: ^I(5230000 KHz - 5330000 KHz @ 40000 KHz), (600 mBi, 2300 mBm)\n kernel: ^I(5735000 KHz - 5835000 KHz @ 40000 KHz), (600 mBi, 3000 mBm)\n\n Indent them with four spaces instead of the tab character to get prettier\n output.\n\n Signed-off-by: Kalle Valo \u003ckalle.valo@nokia.com\u003e\n Acked: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\n Signed-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n\nCc: Petri Karhula \u003cpetri.karhula@nokia.com\u003e\nSigned-off-by: Luis R. Rodriguez \u003cmcgrof@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8848bef0382af53a7c9568bbc6757db97c53a0e3", "tree": "b92592b1aa3095e441d64f0de28899cdc24e0c1a", "parents": [ "a98aa7ae14529144527b64a54a9ecd828fa805a6" ], "author": { "name": "Luis R. Rodriguez", "email": "mcgrof@qca.qualcomm.com", "time": "Tue Dec 20 12:23:36 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:40 2012 -0500" }, "message": "cfg80211: replace reg.c Nokia commit c4c32294\n\nNokia hasn\u0027t gotten back to me in over 1 month for a relicense\nchange request. There are only a few changes that they contributed,\nso just reverting their changes but replacing with another set.\nThis change replaces this commit:\n\ncommit c4c322941ce0d7e2b7b8794ad70683123d9cb26a\nAuthor: Yuri Ershov \u003cext-yuri.ershov@nokia.com\u003e\nDate: Tue Jun 29 15:08:08 2010 +0400\n\n cfg80211: Update of regulatory request initiator handling\n\n In some cases there could be possible dereferencing freed pointer. The\n update is intended to avoid this issue.\n\n Signed-off-by: Yuri Ershov \u003cext-yuri.ershov@nokia.com\u003e\n Signed-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n\nCc: Petri Karhula \u003cpetri.karhula@nokia.com\u003e\nSigned-off-by: Luis R. Rodriguez \u003cmcgrof@qca.qualcomm.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "004161cb52ac49bc17f6528543c1cecbd728f750", "tree": "61701dba816c42e77dc9f941d0e66a8887067919", "parents": [ "637d85a7cdfe4240a56da7d70cf95cca65ea21d3" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Tue Dec 20 16:57:41 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:39 2012 -0500" }, "message": "NFC: Handle error during NCI data exchange\n\nAdd support for NCI Interface Error Notification.\nWhen this notification is received and we\u0027re during a\ndata exchange transaction, indicate an error to the NFC\ncore layer via the data exchange callback.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "637d85a7cdfe4240a56da7d70cf95cca65ea21d3", "tree": "955b49a8a27b871725c0f262f4d475cab59db01c", "parents": [ "cee0bec58a922976a5f4d70081a3b2fd73e108e9" ], "author": { "name": "Ilan Elias", "email": "ilane@ti.com", "time": "Tue Dec 20 16:57:40 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:39 2012 -0500" }, "message": "NFC: Update names and structs to NCI spec 1.0 d22\n\nAddition, deletion, and modification of NCI constants.\nChanges in NCI commands, responses, and notifications structures.\n\nSigned-off-by: Ilan Elias \u003cilane@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "cee0bec58a922976a5f4d70081a3b2fd73e108e9", "tree": "8eab2a655bfb1f210e2e9682ded92a54d35b426c", "parents": [ "b423db5b356749e3e39faad607d387cd4c1a9d30" ], "author": { "name": "Dmitry Shmidt", "email": "dimitrysh@google.com", "time": "Mon Dec 19 12:32:21 2011 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:30:39 2012 -0500" }, "message": "wireless: Protect regdomain change by mutex\n\nSigned-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "b423db5b356749e3e39faad607d387cd4c1a9d30", "tree": "59d89927aea6c1e93f5728a1a9eb89b436f538f4", "parents": [ "dc0d633e35643662f27a0b1c531da3cd6b204b9c" ], "author": { "name": "Helmut Schaa", "email": "helmut.schaa@googlemail.com", "time": "Mon Dec 19 11:39:54 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 14:28:07 2012 -0500" }, "message": "mac80211: Remove superfluous ieee80211_rx_h_remove_qos_control\n\nThis seems to not serve any purpose anymore, at least all frame\nprocessing afterwards seems to be able to deal with QoS frames. So,\nlet\u0027s save the expensive memmove and just leave the QoS header in the\n802.11 frame for further processing.\n\nSigned-off-by: Helmut Schaa \u003chelmut.schaa@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "02a9098ede0dc7e28c16a03fa7fba86a05219478", "tree": "689df90e53168b72b8f2f418853830747bba8e90", "parents": [ "bd16a6cce2a7f169b559abc5672fd2c66e91fb36" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 04 06:23:01 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 14:12:48 2012 -0500" }, "message": "net_sched: sfq: always randomize hash perturbation\n\nSFQ q-\u003eperturbation is used in sfq_hash() as an input to Jenkins hash.\n\nWe currently randomize this 32bit value only if a perturbation timer is\nsetup.\n\nIts much better to always initialize it to defeat attackers, or else\nthey can predict very well what kind of packets they have to forge to\nhit a particular flow.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bd16a6cce2a7f169b559abc5672fd2c66e91fb36", "tree": "a4407fbec170a8ed06bf52a6667d26c4fdd2a124", "parents": [ "6cfb5e759d47f037cbd0953ec2c3ceb220ed9e96" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jan 04 06:22:24 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 14:12:48 2012 -0500" }, "message": "net_sched: sfq: fix mem alloc error recovery\n\nSince commit 817fb15dfd98 (net_sched: sfq: allow divisor to be a\nparameter), we can leave perturbation timer armed if a memory allocation\nerror aborts sfq_init().\n\nMemory containing active struct timer_list is freed and kernel can\ncrash.\n\nCall sfq_destroy() from sfq_init() to properly dismantle qdisc.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6cfb5e759d47f037cbd0953ec2c3ceb220ed9e96", "tree": "7102ec0fd5d43b77343144c06bf743de7320fb79", "parents": [ "8db182f4a8a6e2dcb8b65905ea4af56210e65430" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jan 03 12:07:59 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 14:10:28 2012 -0500" }, "message": "ethtool: Remove ethtool_ops::set_rx_ntuple operation\n\nAll implementations have been converted to implement set_rxnfc\ninstead.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "55664f324c2a1a6386dc88492c5c94aa3d336b93", "tree": "a1859e049a47b3bb207882e4b9db126987f2ead9", "parents": [ "3a73e49caa75928149ea54f570f8afb5f6f4774d" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jan 03 12:04:51 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jan 04 14:09:10 2012 -0500" }, "message": "ethtool: Allow drivers to select RX NFC rule locations\n\nDefine special location values for RX NFC that request the driver to\nselect the actual rule location. This allows for implementation on\ndevices that use hash-based filter lookup, whereas currently the API is\nmore suited to devices with TCAM lookup or linear search.\n\nIn ethtool_set_rxnfc() and the compat wrapper ethtool_ioctl(), copy\nthe structure back to user-space after insertion so that the actual\nlocation is returned.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d8f46ff11081f03b09efe82245a3257bab6bf60e", "tree": "fe47a5fe5ef62920ee3e1ffe5a2fd7a29918c6b0", "parents": [ "405cc2736527bd506fd8f652308b03b2c8a1e8b9", "b015dbc0f95eef34819515bd403a62569bca23df" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 11:37:30 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jan 04 11:37:30 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem\n" }, { "commit": "04fc66e789a896e684bfdca30208e57eb832dd96", "tree": "37c26bff07e48c8c25d147850b7906d0d1c79a81", "parents": [ "4572befe248fd0d94aedc98775e3f0ddc8a26651" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Nov 21 14:58:38 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:19 2012 -0500" }, "message": "switch -\u003epath_mknod() to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "64f1426f3c4f8dde9ac9bf3f3b19b88d17f2bae6", "tree": "ad4bcf7649654666d611cb65018ce484b108bfb0", "parents": [ "a760b03dc0ac4c9663577ca45de5e0fe1c35dc13" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jul 25 00:35:13 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:04 2012 -0500" }, "message": "sunrpc: propagate umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "6b520e0565422966cdf1c3759bd73df77b0f248c", "tree": "f63a26afa7342eb59b125271b16e30a219b59094", "parents": [ "2a79f17e4a641a2f463cb512cb0ec349844a147b" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Dec 12 15:51:45 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:52:40 2012 -0500" }, "message": "vfs: fix the stupidity with i_dentry in inode destructors\n\nSeeing that just about every destructor got that INIT_LIST_HEAD() copied into\nit, there is no point whatsoever keeping this INIT_LIST_HEAD in inode_init_once();\nthe cost of taking it into inode_init_always() will be negligible for pipes\nand sockets and negative for everything else. Not to mention the removal of\nboilerplate code from -\u003edestroy_inode() instances...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "57adc1fcbae2c13104ce291b40f23e40a414fa87", "tree": "a22d95cd3a96cbd515cd24fb0833739576c5e92f", "parents": [ "faa85aa24286a9e14ae7cc797352350c3ac39986", "dc0d633e35643662f27a0b1c531da3cd6b204b9c" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 03 15:16:34 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 03 15:16:34 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem\n\nConflicts:\n\tdrivers/net/wireless/b43/dma.c\n\tdrivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c\n" }, { "commit": "f9dc73e541348288b530c62c21d0fb8fdc7bbd0f", "tree": "caf6201912169f847c0a2b6ab85c4ac1ca65f0dd", "parents": [ "96f1f05af76b601ab21a7dc603ae0a1cea4efc3d", "cad44c2bf6165e46e309d4db0ffd286a9259aa2a" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 03 14:26:56 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jan 03 14:26:56 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth\n" }, { "commit": "fa0f5aa74316c636427ac92dad0bc5714c34ca17", "tree": "64fcb6a7f4043cdaea4a13b730a1ca651190e314", "parents": [ "d32ae76f2b776347051cf821ebe690602e38dfc7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jan 03 00:00:11 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 03 13:03:20 2012 -0500" }, "message": "net_sched: qdisc_alloc_handle() can be too slow\n\nWhen trying to allocate ~32768 qdiscs using autohandle mechanism, we can\nfill the space managed by kernel (handles in [8000-FFFF]:0000 range)\n\nBut O(N^2) qdisc_alloc_handle() loops 0x10000 times instead of 0x8000\n\ntime tc add qdisc add dev eth0 parent 10:7fff pfifo limit 10\nRTNETLINK answers: Cannot allocate memory\nreal 1m54.826s\nuser 0m0.000s\nsys 0m0.004s\n\nINFO: rcu_sched_state detected stall on CPU 0 (t\u003d60000 jiffies)\n\nHalf number of loops, and add a cond_resched() call.\nWe hold rtnl at this point.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Dave Taht \u003cdave.taht@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d32ae76f2b776347051cf821ebe690602e38dfc7", "tree": "3f17a0c00e2ac7cc982c47e442661517ae010d5c", "parents": [ "d47a0ac7b66883987275598d6039f902f4410ca9" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jan 02 11:47:50 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 03 13:02:19 2012 -0500" }, "message": "sch_qfq: accurate wsum handling\n\nWe can underestimate q-\u003ewsum in case of \"tc class replace ... qfq\"\nand/or qdisc_create_dflt() error.\n\nwsum is not really used in fast path, only at qfq qdisc/class setup,\nto catch user error.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6bafcac3238758203703bdd4abe9c1f38d259584", "tree": "b5413ecd31f0fa3229b04bd415c870041fe30d95", "parents": [ "115e8e705e4be071b9e06ff72578e3b603f2ba65" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jan 02 05:47:57 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 03 12:58:23 2012 -0500" }, "message": "sch_qfq: fix overflow in qfq_update_start()\n\ngrp-\u003eslot_shift is between 22 and 41, so using 32bit wide variables is\nprobably a typo.\n\nThis could explain QFQ hangs Dave reported to me, after 2^23 packets ?\n\n(23 \u003d 64 - 41)\n\nReported-by: Dave Taht \u003cdave.taht@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nCC: Dave Taht \u003cdave.taht@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d47a0ac7b66883987275598d6039f902f4410ca9", "tree": "d70709d26a3833e2747126d221bbb2aa3f28ebd7", "parents": [ "1c015b3b82c92fad375ce7dfff54799cfdfb7a15" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Sun Jan 01 18:33:31 2012 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 03 12:52:09 2012 -0500" }, "message": "sch_sfq: dont put new flow at the end of flows\n\nSFQ enqueue algo puts a new flow _behind_ all pre-existing flows in the\ncircular list. In fact this is probably an old SFQ implementation bug.\n\n100 Mbits \u003d ~8333 full frames per second, or ~8 frames per ms.\n\nWith 50 flows, it means your \"new flow\" will have to wait 50 packets\nbeing sent before its own packet. Thats the ~6ms.\n\nWe certainly can change SFQ to give a priority advantage to new flows,\nso that next dequeued packet is taken from a new flow, not an old one.\n\nReported-by: Dave Taht \u003cdave.taht@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "455ffa607f0efa90c9fec99604553b7cdd5274b2", "tree": "6ff12c853b4a26612ceea8191a8eae29b130b670", "parents": [ "3ab0b245aa550ea4670d096092ca8e8d5e14ac89", "115e8e705e4be071b9e06ff72578e3b603f2ba65" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 02 18:56:49 2012 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 02 18:56:49 2012 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "dc0d633e35643662f27a0b1c531da3cd6b204b9c", "tree": "cae724ecca3fb997bf3ad6b70bff4e3c739cd648", "parents": [ "aef6c928a92481f75fbd548eb8c1e840912444b8", "4ae1652ef1bf38e07caa5d1d86ffd3b31103b55a" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 02 16:43:54 2012 -0500" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 02 16:43:54 2012 -0500" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next\n" }, { "commit": "3ab0b245aa550ea4670d096092ca8e8d5e14ac89", "tree": "c676525f070f4400d562953ed4ca681cd12da4d9", "parents": [ "b236916a68d923acff15787b5439d7d684c17ae5" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Fri Dec 30 20:32:26 2011 +0100" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sun Jan 01 16:36:08 2012 +0100" }, "message": "netfilter: nfnetlink_acct: fix nfnl_acct_get operation\n\nThe get operation was not sending the message that was built to\nuser-space. This patch also includes the appropriate handling for\nthe return value of netlink_unicast().\n\nMoreover, fix error codes on error (for example, for non-existing\nentry was uncorrect).\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "c121638277a71c1e1fb44c3e654ea353357bbc2c", "tree": "eacfd2881aa785c462587ab8173461b96c396771", "parents": [ "52793dbe3d60bd73bbebe28b2bfc9f6b4b920d4c" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Fri Dec 30 10:40:17 2011 -0500" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sat Dec 31 16:59:04 2011 +0100" }, "message": "netfilter: ctnetlink: fix timeout calculation\n\nThe sanity check (timeout \u003c 0) never works; the dividend is unsigned\nand so is the division, which should have been a signed division.\n\n\tlong timeout \u003d (ct-\u003etimeout.expires - jiffies) / HZ;\n\tif (timeout \u003c 0)\n\t\ttimeout \u003d 0;\n\nThis patch converts the time values to signed for the division.\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "52793dbe3d60bd73bbebe28b2bfc9f6b4b920d4c", "tree": "845ae88e96de3b28884bab1e868e00ba4687fd02", "parents": [ "fe3c8cc9226c7487c053edad9229dc85e93534d7" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Fri Dec 30 14:19:02 2011 +0900" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Sat Dec 31 16:06:29 2011 +0100" }, "message": "ipvs: try also real server with port 0 in backup server\n\n\tWe should not forget to try for real server with port 0\nin the backup server when processing the sync message. We should\ndo it in all cases because the backup server can use different\nforwarding method.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "50612537e9ab29693122fab20fc1eed235054ffe", "tree": "389279a18e07ce046ef694b37f44ccbc7fe796a1", "parents": [ "32b293a53deeb220769f9a29357cb151cfb8ee26" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Dec 28 23:12:02 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 17:12:23 2011 -0500" }, "message": "netem: fix classful handling\n\nCommit 10f6dfcfde (Revert \"sch_netem: Remove classful functionality\")\nreintroduced classful functionality to netem, but broke basic netem\nbehavior :\n\nnetem uses an t(ime)fifo queue, and store timestamps in skb-\u003ecb[]\n\nIf qdisc is changed, time constraints are not respected and other qdisc\ncan destroy skb-\u003ecb[] and block netem at dequeue time.\n\nFix this by always using internal tfifo, and optionally attach a child\nqdisc to netem (or a tree of qdiscs)\n\nExample of use :\n\nDEV\u003deth3\ntc qdisc del dev $DEV root\ntc qdisc add dev $DEV root handle 30: est 1sec 8sec netem delay 20ms 10ms\ntc qdisc add dev $DEV handle 40:0 parent 30:0 tbf \\\n\tburst 20480 limit 20480 mtu 1514 rate 32000bps\n\nqdisc netem 30: root refcnt 18 limit 1000 delay 20.0ms 10.0ms\n Sent 190792 bytes 413 pkt (dropped 0, overlimits 0 requeues 0)\n rate 18416bit 3pps backlog 0b 0p requeues 0\nqdisc tbf 40: parent 30: rate 256000bit burst 20Kb/8 mpu 0b lat 0us\n Sent 190792 bytes 413 pkt (dropped 6, overlimits 10 requeues 0)\n backlog 0b 5p requeues 0\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32b293a53deeb220769f9a29357cb151cfb8ee26", "tree": "449cac8df3c48be49657331c9b6958ccdd360e18", "parents": [ "c9da99e6475f92653139e43f3c30c0cd011a0fd8" ], "author": { "name": "Josh Hunt", "email": "joshhunt00@gmail.com", "time": "Wed Dec 28 13:23:07 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 17:07:33 2011 -0500" }, "message": "IPv6: Avoid taking write lock for /proc/net/ipv6_route\n\nDuring some debugging I needed to look into how /proc/net/ipv6_route\noperated and in my digging I found its calling fib6_clean_all() which uses\n\"write_lock_bh(\u0026table-\u003etb6_lock)\" before doing the walk of the table. I\nfound this on 2.6.32, but reading the code I believe the same basic idea\nexists currently. Looking at the rtnetlink code they are only calling\n\"read_lock_bh(\u0026table-\u003etb6_lock);\" via fib6_dump_table(). While I realize\nreading from proc isn\u0027t the recommended way of fetching the ipv6 route\ntable; taking a write lock seems unnecessary and would probably cause\nnetwork performance issues.\n\nTo verify this I loaded up the ipv6 route table and then ran iperf in 3\ncases:\n * doing nothing\n * reading ipv6 route table via proc\n (while :; do cat /proc/net/ipv6_route \u003e /dev/null; done)\n * reading ipv6 route table via rtnetlink\n (while :; do ip -6 route show table all \u003e /dev/null; done)\n\n* Load the ipv6 route table up with:\n * for ((i \u003d 0;i \u003c 4000;i++)); do ip route add unreachable 2000::$i; done\n\n* iperf commands:\n * client: iperf -i 1 -V -c \u003cipv6 addr\u003e\n * server: iperf -V -s\n\n* iperf results - 3 runs each (in Mbits/sec)\n * nothing: client: 927,927,927 server: 927,927,927\n * proc: client: 179,97,96,113 server: 142,112,133\n * iproute: client: 928,927,928 server: 927,927,927\n\nlock_stat shows taking the write lock is causing the slowdown. Using this\ninfo I decided to write a version of fib6_clean_all() which replaces\nwrite_lock_bh(\u0026table-\u003etb6_lock) with read_lock_bh(\u0026table-\u003etb6_lock). With\nthis new function I see the same results as with my rtnetlink iperf test.\n\nSigned-off-by: Josh Hunt \u003cjoshhunt00@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c9da99e6475f92653139e43f3c30c0cd011a0fd8", "tree": "d78e4097afdcba4a3a4dd2303cc8bd475331b75a", "parents": [ "885ee74d5d3058e4a904671ed7929c9540c95fa5" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 30 00:54:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 16:46:02 2011 -0500" }, "message": "unix_diag: Fixup RQLEN extension report\n\nWhile it\u0027s not too late fix the recently added RQLEN diag extension\nto report rqlen and wqlen in the same way as TCP does.\n\nI.e. for listening sockets the ack backlog length (which is the input\nqueue length for socket) in rqlen and the max ack backlog length in\nwqlen, and what the CINQ/OUTQ ioctls do for established.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "885ee74d5d3058e4a904671ed7929c9540c95fa5", "tree": "83420dadda4c863a7bcebedf291f4d7009ffbb5f", "parents": [ "257b529876cb45ec791eaa89e3d2ee0d16b49383" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 30 00:54:11 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 16:45:45 2011 -0500" }, "message": "af_unix: Move CINQ/COUTQ code to helpers\n\nCurrently tcp diag reports rqlen and wqlen values similar to how\nthe CINQ/COUTQ iotcls do. To make unix diag report these values\nin the same way move the respective code into helpers.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "257b529876cb45ec791eaa89e3d2ee0d16b49383", "tree": "a052a1d16ae992cbfa5234af0cbfcea3a6cff6d7", "parents": [ "c0636faa539ec4205ec50e80844a5b0454b4bbaa" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 30 09:27:43 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 16:44:24 2011 -0500" }, "message": "unix_diag: Add the MEMINFO extension\n\n[ Fix indentation of sock_diag*() calls. -DaveM ]\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c0636faa539ec4205ec50e80844a5b0454b4bbaa", "tree": "16af09a4c857a1ec45bf573e39c6b46fedbd103f", "parents": [ "5d2e5f274f9e9a06fb934dd45260e2616a9992e6" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 30 00:53:32 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 16:42:19 2011 -0500" }, "message": "inet_diag: Add the SKMEMINFO extension\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5d2e5f274f9e9a06fb934dd45260e2616a9992e6", "tree": "61ae9157e41b00a19f58518d58d0c739393cbccb", "parents": [ "288461e1546fa4162fa237eeed8ea09a16521dcd" ], "author": { "name": "Pavel Emelyanov", "email": "xemul@parallels.com", "time": "Fri Dec 30 00:53:13 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 16:42:19 2011 -0500" }, "message": "sock_diag: Introduce the meminfo nla core (v2)\n\nAdd a routine that dumps memory-related values of a socket.\nIt\u0027s made as an array to make it possible to add more stuff\nhere later without breaking compatibility.\n\nSince v1: The SK_MEMINFO_ constants are in userspace\nvisible part of sock_diag.h, the rest is under __KERNEL__.\n\nSigned-off-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "56be178875cf699a17cc285171492353620ef0ae", "tree": "26b8f0473d5c8f6fcbc50d76bb30aae0dd176bd5", "parents": [ "7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61", "f19765f4f7dc3cb118cf5f151ed56e01063082ed" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:46:54 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:46:54 2011 -0500" }, "message": "Merge branch \u0027tipc-Dec29-2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n" }, { "commit": "7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61", "tree": "d6e9edb2087fa4a97b2cc3d585a0189672a14cf4", "parents": [ "8ade06c616b34b4237c0ed77d1ff0ce04ad7d056", "89307babf966165171547f105e2253dec261cfa5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:04:14 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:04:14 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "f19765f4f7dc3cb118cf5f151ed56e01063082ed", "tree": "b92015df8dedb940c6b6b99fe97ea35c19949221", "parents": [ "a18c4bc3ea3c23f658655b1eee4f62cb71d51efd" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 21:39:49 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 21:53:30 2011 -0500" }, "message": "tipc: rename struct bearer_name to struct tipc_bearer_names\n\nThe addition of the \"s\" to indicate pluralization is intentional,\nsince the struct actually contains two name variants.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "a18c4bc3ea3c23f658655b1eee4f62cb71d51efd", "tree": "573ab87dd9826f1956bb3a17e481842284ad8321", "parents": [ "7f9ab6ac2e79b9658eba7c8e3ad8a4392d308057" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 20:58:42 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 21:53:30 2011 -0500" }, "message": "tipc: rename struct link* to struct tipc_link*\n\nThis converts the following:\n\n\tstruct link\t\t-\u003e\tstruct tipc_link\n\tstruct link_req\t\t-\u003e\tstruct tipc_link_req\n\tstruct link_name\t-\u003e\tstruct tipc_link_name\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "7f9ab6ac2e79b9658eba7c8e3ad8a4392d308057", "tree": "e168521bd8e4630d31dfe674609810a92c1d1012", "parents": [ "6765fd677168df46dbed3cb4c32b9104ce2d3e83" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 20:55:27 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 21:53:30 2011 -0500" }, "message": "tipc: rename struct bcbearer* to tipc_bcbearer*\n\nThis changes both the struct bcbearer and struct bcbearer_pair to\nhave the \"tipc_\" prefix. Runtime behaviour is unchanged.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "6765fd677168df46dbed3cb4c32b9104ce2d3e83", "tree": "8d214d2cb13fc0ab40bb5d225d4d43e65440bd3e", "parents": [ "11f9990604637e08f163f919ab37d8834dff5583" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 20:52:18 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 21:53:30 2011 -0500" }, "message": "tipc: rename struct bclink to struct tipc_bclink\n\nMake this rename so that it is consistent with the majority\nof the other tipc structs and to assist in removing any\nambiguity with other similar names in other subsystems.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "11f9990604637e08f163f919ab37d8834dff5583", "tree": "139b55605367de97fde0ab2abb43119f7bb0b76c", "parents": [ "fead39098badacbfb5890de9a10e5b265788a524" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 20:49:39 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 21:53:30 2011 -0500" }, "message": "tipc: rename struct subscriber to struct tipc_subscriber\n\nMake this rename so that it is consistent with the majority\nof the other tipc structs and to assist in removing any\nambiguity with other similar names in other subsystems.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "fead39098badacbfb5890de9a10e5b265788a524", "tree": "98d6f26a9525a8289efc79d6bb5fc626ae890b42", "parents": [ "4584310b4a787c9b70e5507a8b5288ba32b0a909" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 20:43:44 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 21:53:29 2011 -0500" }, "message": "tipc: rename struct subscription to struct tipc_subscription\n\nMake this rename so that it is consistent with the majority\nof the other tipc structs and to assist in removing any\nambiguity with other similar names in other subsystems.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "4584310b4a787c9b70e5507a8b5288ba32b0a909", "tree": "d3322226efb9610bfdbaf6304266e0bd46adba63", "parents": [ "358a0d1c9edcf6ff041776d65cdc2bc59887ab9c" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 20:33:30 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 21:53:29 2011 -0500" }, "message": "tipc: rename struct port_list to struct tipc_port_list\n\nMake this rename so that it is consistent with the majority\nof the other tipc structs and to assist in removing any\nambiguity with other similar names in other subsystems.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "358a0d1c9edcf6ff041776d65cdc2bc59887ab9c", "tree": "656650f418e5127062e8e69000afb067d1bf79b1", "parents": [ "d191854282fd831da785a5a34bc6fd16049b8578" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 20:19:42 2011 -0500" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Dec 29 21:53:29 2011 -0500" }, "message": "tipc: rename struct media to struct tipc_media\n\nGive it a meaningful prefix, as suggested by DaveM, so that it\nis consistent with things like struct tipc_bearer, and so it isn\u0027t\nconfused with anything else. This has no impact on the actual\nruntime code behaviour.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "8ade06c616b34b4237c0ed77d1ff0ce04ad7d056", "tree": "73cccfb3f6ca9cb8d2d9fcd9aed5a2bffb8ab49d", "parents": [ "f1776dade17cd54562f4bc1d01de89c4908b4dd0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 18:51:57 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 18:51:57 2011 -0500" }, "message": "ipv6: Fix neigh lookup using NULL device.\n\nIn some of the rt6_bind_neighbour() call sites, it hasn\u0027t hooked\nup the rt-\u003edst.dev pointer yet, so we\u0027d deref a NULL pointer when\nobtaining dev-\u003eifindex for the neighbour hash function computation.\n\nJust pass the netdevice explicitly in to fix this problem.\n\nReported-by: Bjarke Istrup Pedersen \u003cgurligebis@gentoo.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "346f870b8a9aaf0847f7c7cffdbb447bb2f3853e", "tree": "fca645087c2dcae6be1f64181e5d703d4bbefcaa", "parents": [ "95f56e7aa807e9eec241a5b70f0695b2514b5ad5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 15:22:33 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 15:22:33 2011 -0500" }, "message": "ipv6: Report TCP timetstamp info in cacheinfo just like ipv4 does.\n\nI missed this while adding ipv6 support to inet_peer.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b0460e4484f9e990caa817230204f9e3800cf955", "tree": "3c8d3bf4448a4b99ffa6445a949abe1bee85c34c", "parents": [ "bc94b52167596e4f9c0a020c10e2f49b04a2e48b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Dec 28 23:27:44 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 15:07:21 2011 -0500" }, "message": "sch_tbf: report backlog information\n\nProvide child qdisc backlog (byte count) information so that \"tc -s\nqdisc\" can report it to user.\n\nqdisc netem 30: root refcnt 18 limit 1000 delay 20.0ms 10.0ms\n Sent 948517 bytes 898 pkt (dropped 0, overlimits 0 requeues 1)\n rate 175056bit 16pps backlog 114b 1p requeues 1\nqdisc tbf 40: parent 30: rate 256000bit burst 20Kb/8 mpu 0b lat 0us\n Sent 948517 bytes 898 pkt (dropped 15, overlimits 611 requeues 0)\n backlog 18168b 12p requeues 0\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc94b52167596e4f9c0a020c10e2f49b04a2e48b", "tree": "e873478149fd8fa590ef83947eee059ddbf5cdca", "parents": [ "d191854282fd831da785a5a34bc6fd16049b8578" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Wed Dec 28 15:03:30 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 29 14:39:19 2011 -0500" }, "message": "netfilter: Kconfig: fix unmet xt_nfacct dependencies\n\nwarning: (NETFILTER_XT_MATCH_NFACCT) selects NETFILTER_NETLINK_ACCT which has\nunmet direct dependencies (NET \u0026\u0026 INET \u0026\u0026 NETFILTER \u0026\u0026 NETFILTER_ADVANCED)\n\nand then\n\nERROR: \"nfnetlink_subsys_unregister\" [net/netfilter/nfnetlink_acct.ko] undefined!\nERROR: \"nfnetlink_subsys_register\" [net/netfilter/nfnetlink_acct.ko] undefined!\n\nReported-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d191854282fd831da785a5a34bc6fd16049b8578", "tree": "2a2700b2dec7ad9e73c55c833346dbbd67b8777c", "parents": [ "f83c7790dc0025fffbd8684f3803a7571f624baa" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 20:19:20 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 20:19:20 2011 -0500" }, "message": "ipv6: Kill rt6i_dev and rt6i_expires defines.\n\nIt just obscures that the netdevice pointer and the expires value are\nimplemented in the dst_entry sub-object of the ipv6 route.\n\nAnd it makes grepping for dst_entry member uses much harder too.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f83c7790dc0025fffbd8684f3803a7571f624baa", "tree": "9e745f6b44b1947033a143423560af6a3157fce7", "parents": [ "2c2aba6c561ac425602f4a0be61422224cb87151" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 15:41:23 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 15:41:23 2011 -0500" }, "message": "ipv6: Create fast inline ipv6 neigh lookup just like ipv4.\n\nAlso, create and use an rt6_bind_neighbour() in net/ipv6/route.c to\nconsolidate some common logic.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2c2aba6c561ac425602f4a0be61422224cb87151", "tree": "30b5f2c40b823ca61e2e0930d5e98a89a83222bb", "parents": [ "32288eb4d940b10e40c6d4178fe3a40d1437d2f8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 15:06:58 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 15:06:58 2011 -0500" }, "message": "ipv6: Use universal hash for NDISC.\n\nIn order to perform a proper universal hash on a vector of integers,\nwe have to use different universal hashes on each vector element.\n\nWhich means we need 4 different hash randoms for ipv6.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32288eb4d940b10e40c6d4178fe3a40d1437d2f8", "tree": "7cdd2b53eae8b6381eec1ddd497f28615277f1c2", "parents": [ "ba1cffe0257bcd4d0070bc0e64f8ead97fefd148" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Tue Dec 27 09:44:53 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 14:08:08 2011 -0500" }, "message": "netrom: avoid overflows in nr_setsockopt()\n\nCheck setsockopt arguments to avoid overflows and return -EINVAL for\ntoo large arguments.\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ba1cffe0257bcd4d0070bc0e64f8ead97fefd148", "tree": "5584b7816f7eb46953611ec35628c6924ea5a2af", "parents": [ "fa84309533025eb3f03dc1d2d2be1c3ca206882a" ], "author": { "name": "Xi Wang", "email": "xi.wang@gmail.com", "time": "Tue Dec 27 09:43:19 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 14:08:08 2011 -0500" }, "message": "ax25: avoid overflows in ax25_setsockopt()\n\nCommit be639ac6 (\"NET: AX.25: Check ioctl arguments to avoid overflows\nfurther down the road\") rejects very large arguments, but doesn\u0027t\ncompletely fix overflows on 64-bit systems. Consider the AX25_T2 case.\n\n\tint opt;\n\t...\n\tif (opt \u003c 1 || opt \u003e ULONG_MAX / HZ) {\n\t\tres \u003d -EINVAL;\n\t\tbreak;\n\t}\n\tax25-\u003et2 \u003d opt * HZ;\n\nThe 32-bit multiplication opt * HZ would overflow before being assigned\nto 64-bit ax25-\u003et2. This patch changes \"opt\" to unsigned long.\n\nSigned-off-by: Xi Wang \u003cxi.wang@gmail.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa84309533025eb3f03dc1d2d2be1c3ca206882a", "tree": "d023095d481cb331e8cfc569de18ea89a04eb7fd", "parents": [ "7ffbcecbeed91e5874e9a1cfc4c0cbb07dac3069" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Wed Dec 28 13:48:55 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 13:48:55 2011 -0500" }, "message": "genetlink: add auto module loading\n\nWhen testing L2TP support, I discovered that the l2tp module is not autoloaded\nas are other netlink interfaces. There is because of lack of hook in genetlink to call\nrequest_module and load the module.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ffbcecbeed91e5874e9a1cfc4c0cbb07dac3069", "tree": "c9a6ac231343b25e9049689eb679bf1364602092", "parents": [ "d79aec83b2c348f49065a4d411e7b70bdf041c89" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Tue Dec 27 09:53:05 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 28 13:38:49 2011 -0500" }, "message": "ipv6: Remove optimistic DAD flag test in ipv6_add_addr()\n\nThe route we have here is for the address being added to the interface,\nie. for input packet processing.\n\nTherefore using that route to determine whether an output nexthop gateway\nis known and resolved doesn\u0027t make any sense.\n\nSo, simply remove this test, it never triggered anyways.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-By: Neil Horman \u003cnhorman@tuxdriver.com\u003e\n" }, { "commit": "aef950b4ba3196622a5bd5e21ab1d63f30658285", "tree": "f4cb91f4517a041ef95c28ad50039b0b2ae6b137", "parents": [ "c43c5f39584c0f388a7e5372312c2c48221a4415" ], "author": { "name": "Wei Yongjun", "email": "yongjun_wei@trendmicro.com.cn", "time": "Tue Dec 27 22:32:41 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 27 22:32:41 2011 -0500" }, "message": "packet: fix possible dev refcnt leak when bind fail\n\nIf bind is fail when bind is called after set PACKET_FANOUT\nsock option, the dev refcnt will leak.\n\nSigned-off-by: Wei Yongjun \u003cyongjun_wei@trendmicro.com.cn\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "54b07dca68557b0952585b5f4834cd0dd86eba35", "tree": "9b6b03f029f4f1a4e02ead16177c626fab863cd5", "parents": [ "42c344a3bc6bb2eb4c0bef98d24d53adda255154" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Apr 21 09:32:45 2011 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Dec 27 20:45:28 2011 +0100" }, "message": "netfilter: provide config option to disable ancient procfs parts\n\nUsing /proc/net/nf_conntrack has been deprecated in favour of the\nconntrack(8) tool.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "42c344a3bc6bb2eb4c0bef98d24d53adda255154", "tree": "22e7e84bd68531ac4fe51cebc813ef9ac41dfd13", "parents": [ "af0d29cd2a732f70882e6122b9f9df8b0d84515e" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Jun 09 22:16:50 2011 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Dec 27 20:45:25 2011 +0100" }, "message": "netfilter: xtables: collapse conditions in xt_ecn\n\nOne simplification of an if clause.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "af0d29cd2a732f70882e6122b9f9df8b0d84515e", "tree": "ae1057444d3a646c71e99ff3b93d0745c7e93ce0", "parents": [ "a4c6f9d3636db538025f9622c008192a0835cc23" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 09 15:20:27 2011 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Dec 27 20:31:42 2011 +0100" }, "message": "netfilter: xtables: add an IPv6 capable version of the ECN match\n\nReferences: http://www.spinics.net/lists/netfilter-devel/msg18875.html\n\nAugment xt_ecn by facilities to match on IPv6 packets\u0027 DSCP/TOS field\nsimilar to how it is already done for the IPv4 packet field.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "a4c6f9d3636db538025f9622c008192a0835cc23", "tree": "725c79a8d16b5c57bb5dadb0e83bd09ce985a0b5", "parents": [ "d446a8202c81d95f91b1682fc67e7fadd9a31389" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Jun 09 21:15:37 2011 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Dec 27 20:31:38 2011 +0100" }, "message": "netfilter: xtables: give xt_ecn its own name\n\nUse the new macro and struct names in xt_ecn.h, and put the old\ndefinitions into a definition-forwarding ipt_ecn.h.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "d446a8202c81d95f91b1682fc67e7fadd9a31389", "tree": "e3e7dcc79eab38846b53af613929b68aa0318752", "parents": [ "c0d2b8376ae2d74aa862e946a372502603e9066d" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Thu Jun 09 21:03:07 2011 +0200" }, "committer": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Tue Dec 27 20:31:31 2011 +0100" }, "message": "netfilter: xtables: move ipt_ecn to xt_ecn\n\nPrepare the ECN match for augmentation by an IPv6 counterpart. Since\nno symbol dependencies to ipv6.ko are added, having a single ecn match\nmodule is the more so welcome.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\n" }, { "commit": "4ae1652ef1bf38e07caa5d1d86ffd3b31103b55a", "tree": "c75275f7080589390fd7b80556e518cb49ec7c73", "parents": [ "3573b80c42e88c2a43c068c86bcd1a753cf6e1a0" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Tue Dec 27 14:43:41 2011 -0200" }, "committer": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Tue Dec 27 14:43:41 2011 -0200" }, "message": "Bluetooth: Fix a compile warning in RFCOMM\n\nsock and sk were leftover from another change.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\n" }, { "commit": "f905730c7ed97dc2dfcbf6af894acd6ce70a62e7", "tree": "15e9f4ebe56165668dfb61dc77bef84daefc807c", "parents": [ "3655959143ebf1fd32e28a448d204be2f7f13e99" ], "author": { "name": "Allan Stephens", "email": "allan.stephens@windriver.com", "time": "Mon Oct 24 16:03:12 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Dec 27 11:33:54 2011 -0500" }, "message": "tipc: Allow use of buf_seqno() helper routine by unicast links\n\nMigrates the buf_seqno() helper routine from broadcast link level to\nunicast link level so that it can be used both types of TIPC links.\nThis is a cosmetic change only, and does not affect the operation of TIPC.\n\nSigned-off-by: Allan Stephens \u003callan.stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "3655959143ebf1fd32e28a448d204be2f7f13e99", "tree": "441e42f4e55fedf7d262a3d43ba356a1598f36c5", "parents": [ "10745cd5990542447268f60078133df8b1ee960b" ], "author": { "name": "Allan Stephens", "email": "allan.stephens@windriver.com", "time": "Mon Oct 24 15:26:24 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Dec 27 11:33:53 2011 -0500" }, "message": "tipc: Ignore broadcast acknowledgements that are out-of-range\n\nAdds checks to TIPC\u0027s broadcast link so that it ignores any\nacknowledgement message containing a sequence number that does not\ncorrespond to an unacknowledged message currently in the broadcast\nlink\u0027s transmit queue.\n\nThis change prevents the broadcast link from becoming stalled if a\nnewly booted node receives stale broadcast link acknowledgement\ninformation from another node that has not yet fully synchronized\nits end of the broadcast link to reflect the current state of the\nnew node\u0027s end.\n\nSigned-off-by: Allan Stephens \u003callan.stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "10745cd5990542447268f60078133df8b1ee960b", "tree": "544d8226e2adf82a31e5bb7639c439a12bec7cea", "parents": [ "9157bafb44637a2cfefc222d6551100ead40e79e" ], "author": { "name": "Allan Stephens", "email": "allan.stephens@windriver.com", "time": "Mon Oct 24 14:59:20 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Dec 27 11:33:52 2011 -0500" }, "message": "tipc: Flush unsent broadcast messages when contact with last node is lost\n\nAdds code to release any unsent broadcast messages in the broadcast link\ntransmit queue if TIPC loses contact with its only neighboring node.\nPreviously, a broadcast link that was in the congested state would hold\non to the unsent messages, even though the messages were now undeliverable.\n\nSigned-off-by: Allan Stephens \u003callan.stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "9157bafb44637a2cfefc222d6551100ead40e79e", "tree": "03daf741edd6dc848ec38eff1aead23c31c5c83a", "parents": [ "2b78f9a002dccc587912af4da3bf1db86909de91" ], "author": { "name": "Allan Stephens", "email": "allan.stephens@windriver.com", "time": "Mon Oct 24 13:27:31 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Dec 27 11:33:51 2011 -0500" }, "message": "tipc: Minor optimization of broadcast link transmit queue statistic\n\nThe two broadcast link statistics fields that are used to derive the\naverage length of that link\u0027s transmit queue are now updated only after\na successful attempt to send a broadcast message, since there is no need\nto update these values when an unsuccessful send attempt leaves the\nqueue unchanged.\n\nSigned-off-by: Allan Stephens \u003callan.stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "2b78f9a002dccc587912af4da3bf1db86909de91", "tree": "60dafc91a970c116e7d8c3f53152a75f9e77d854", "parents": [ "cd3decdfd1dbab8a585eafe2e5b9866f193de99e" ], "author": { "name": "Allan Stephens", "email": "allan.stephens@windriver.com", "time": "Mon Oct 24 13:05:55 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Dec 27 11:33:50 2011 -0500" }, "message": "tipc: Handle broadcast attempt when no neighboring nodes exist\n\nAdds a check to detect when an attempt is made to send a message\nvia the broadcast link and no neighboring nodes are currently available\nto receive it. Rather than wasting effort passing the message to the\nbroadcast link and broadcast bearer, who will only throw it away,\nTIPC now frees the message immediately and reports success (i.e. the\nmessage has been delivered to all available destinations).\n\nSigned-off-by: Allan Stephens \u003callan.stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "cd3decdfd1dbab8a585eafe2e5b9866f193de99e", "tree": "6683d9e56ca9554aa8c446b311521449c2f4ded5", "parents": [ "c47e9b918844ab7bb139eada7b085c576ddf0afb" ], "author": { "name": "Allan Stephens", "email": "allan.stephens@windriver.com", "time": "Mon Oct 24 11:18:12 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Dec 27 11:33:48 2011 -0500" }, "message": "tipc: Ensure broadcast link spinlock is held when updating node map\n\nFixes oversight that allowed broadcast link node map to be updated without\nfirst taking the broadcast link spinlock that protects the map. As part\nof this fix the node map has been incorporated into the broadcast link\nstructure to make the need for such protection more evident.\n\nSigned-off-by: Allan Stephens \u003callan.stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "c47e9b918844ab7bb139eada7b085c576ddf0afb", "tree": "492e8ac4c1191b1c7be865efacc7833ebcb6fff9", "parents": [ "945af1c39df00a1e5873e38145432ba752ec49a0" ], "author": { "name": "Allan Stephens", "email": "allan.stephens@windriver.com", "time": "Mon Oct 24 10:29:26 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Dec 27 11:33:47 2011 -0500" }, "message": "tipc: Eliminate dynamic allocation of broadcast link data structures\n\nCreates global variables to hold the broadcast link\u0027s pseudo-bearer and\npseudo-link structures, rather than allocating them dynamically. There\nis only a single instance of each structure, and changing over to static\nallocation allows elimination of code to handle the cases where dynamic\nallocation was unsuccessful.\n\nThe memset in the teardown code may look like they aren\u0027t used, but\nthe same teardown code is run when there is a non-fatal error at\ninit-time, so that stale data isn\u0027t present when the user fixes the\ncause of the soft error.\n\nSigned-off-by: Allan Stephens \u003callan.stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "945af1c39df00a1e5873e38145432ba752ec49a0", "tree": "4fecb46c23a92b3635eb1db071b4e08edbe9fe86", "parents": [ "97f1b625d133b44d38b8b55ec2cbe35d7ef94f3a" ], "author": { "name": "Allan Stephens", "email": "allan.stephens@windriver.com", "time": "Fri Oct 14 14:42:25 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Tue Dec 27 11:33:46 2011 -0500" }, "message": "tipc: Eliminate useless check when network address is assigned\n\nGets rid of an unnecessary check in the routine that updates the port id\nof a node\u0027s name publications when the node is assigned a network address,\nsince the routine is only invoked if the new address is different from\nthe existing one.\n\nSigned-off-by: Allan Stephens \u003callan.stephens@windriver.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" } ], "next": "97f1b625d133b44d38b8b55ec2cbe35d7ef94f3a" }