)]}' { "log": [ { "commit": "01f83d69844d307be2aa6fea88b0e8fe5cbdb2f4", "tree": "b01eba7a8b9cf737312c3721ff8ef361baa55bea", "parents": [ "6dcbc12290abb452a5e42713faa6461b248e2f55" ], "author": { "name": "Alexey Kuznetsov", "email": "kuznet@ms2.inr.ac.ru", "time": "Wed Sep 15 10:27:52 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 15 12:01:44 2010 -0700" }, "message": "tcp: Prevent overzealous packetization by SWS logic.\n\nIf peer uses tiny MSS (say, 75 bytes) and similarly tiny advertised\nwindow, the SWS logic will packetize to half the MSS unnecessarily.\n\nThis causes problems with some embedded devices.\n\nHowever for large MSS devices we do want to half-MSS packetize\notherwise we never get enough packets into the pipe for things\nlike fast retransmit and recovery to work.\n\nBe careful also to handle the case where MSS \u003e window, otherwise\nwe\u0027ll never send until the probe timer.\n\nReported-by: ツ Leandro Melo de Sales \u003cleandroal@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "719f835853a92f6090258114a72ffe41f09155cd", "tree": "a077b05397bf07a096be7f07b50375c5ed918ac2", "parents": [ "ae2688d59b5f861dc70a091d003773975d2ae7fb" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Sep 08 05:08:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 21:45:01 2010 -0700" }, "message": "udp: add rehash on connect()\n\ncommit 30fff923 introduced in linux-2.6.33 (udp: bind() optimisation)\nadded a secondary hash on UDP, hashed on (local addr, local port).\n\nProblem is that following sequence :\n\nfd \u003d socket(...)\nconnect(fd, \u0026remote, ...)\n\nnot only selects remote end point (address and port), but also sets\nlocal address, while UDP stack stored in secondary hash table the socket\nwhile its local address was INADDR_ANY (or ipv6 equivalent)\n\nSequence is :\n - autobind() : choose a random local port, insert socket in hash tables\n [while local address is INADDR_ANY]\n - connect() : set remote address and port, change local address to IP\n given by a route lookup.\n\nWhen an incoming UDP frame comes, if more than 10 sockets are found in\nprimary hash table, we switch to secondary table, and fail to find\nsocket because its local address changed.\n\nOne solution to this problem is to rehash datagram socket if needed.\n\nWe add a new rehash(struct socket *) method in \"struct proto\", and\nimplement this method for UDP v4 \u0026 v6, using a common helper.\n\nThis rehashing only takes care of secondary hash table, since primary\nhash (based on local port only) is not changed.\n\nReported-by: Krzysztof Piotr Oledzki \u003cole@ans.pl\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: Krzysztof Piotr Oledzki \u003cole@ans.pl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6523ce1525e88c598c75a1a6b8c4edddfa9defe8", "tree": "c3439e9c509676a0c29cd81fdaa65ad2632b903c", "parents": [ "64289c8e6851bca0e589e064c9a5c9fbd6ae5dd4" ], "author": { "name": "Julian Anastasov", "email": "ja@ssi.bg", "time": "Sun Sep 05 18:02:29 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 10:39:57 2010 -0700" }, "message": "ipvs: fix active FTP\n\n- Do not create expectation when forwarding the PORT\n command to avoid blocking the connection. The problem is that\n nf_conntrack_ftp.c:help() tries to create the same expectation later in\n POST_ROUTING and drops the packet with \"dropping packet\" message after\n failure in nf_ct_expect_related.\n\n- Change ip_vs_update_conntrack to alter the conntrack\n for related connections from real server. If we do not alter the reply in\n this direction the next packet from client sent to vport 20 comes as NEW\n connection. We alter it but may be some collision happens for both\n conntracks and the second conntrack gets destroyed immediately. The\n connection stucks too.\n\nSigned-off-by: Julian Anastasov \u003cja@ssi.bg\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3fb5a991916091a908d53608a5899240039fb51e", "tree": "fa8e5855de904daffba92bd177fa57ee85641521", "parents": [ "323f30b361b2e6febb9065ab4a1a5298acb66ac1" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Sep 02 15:42:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Sep 03 09:55:24 2010 -0700" }, "message": "cls_cgroup: Fix rcu lockdep warning\n\nDave reported an rcu lockdep warning on 2.6.35.4 kernel\n\ntask-\u003ecgroups and task-\u003ecgroups-\u003esubsys[i] are protected by RCU.\nSo we avoid accessing invalid pointers here. This might happen,\nfor example, when you are deref-ing those pointers while someone\nmove @task from one cgroup to another.\n\nReported-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ad1af0fedba14f82b240a03fe20eb9b2fdbd0357", "tree": "4d53aa8bc2d9df782aa792e52670ab55c7a44d5b", "parents": [ "b2bc85631e72485b984bcd202a104591874babba" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 25 02:27:49 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 25 02:27:49 2010 -0700" }, "message": "tcp: Combat per-cpu skew in orphan tests.\n\nAs reported by Anton Blanchard when we use\npercpu_counter_read_positive() to make our orphan socket limit checks,\nthe check can be off by up to num_cpus_online() * batch (which is 32\nby default) which on a 128 cpu machine can be as large as the default\norphan limit itself.\n\nFix this by doing the full expensive sum check if the optimized check\ntriggers.\n\nReported-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n" }, { "commit": "1c114f42a597346de793a1d166478266a7ec3b61", "tree": "5eb2b7d0484a5a57f8f0a26b655068fd51c752c6", "parents": [ "9871e50edd25e2adf69b369817100821cb1e6de8", "533b12c88d895cf42d5f439e25be2a2ea026b9e8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 15:59:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 15:59:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "db12d647ccc971ed120199dc7ea5be2b5887d328", "tree": "6720ef2cbcd408fcca4c94b855970ca1e9908f3e", "parents": [ "cff70fae111efba80c27023772ce5265797fb514" ], "author": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Thu Aug 05 15:54:27 2010 -0700" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Tue Aug 10 07:59:11 2010 -0400" }, "message": "Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size\n\nThe previous value of 672 for L2CAP_DEFAULT_MAX_PDU_SIZE is based on\nthe default L2CAP MTU. That default MTU is calculated from the size\nof two DH5 packets, minus ACL and L2CAP b-frame header overhead.\n\nERTM is used with newer basebands that typically support larger 3-DH5\npackets, and i-frames and s-frames have more header overhead. With\nclean RF conditions, basebands will typically attempt to use 1021-byte\n3-DH5 packets for maximum throughput. Adjusting for 2 bytes of ACL\nheaders plus 10 bytes of worst-case L2CAP headers yields 1009 bytes\nof payload.\n\nThis PDU size imposes less overhead for header bytes and gives the\nbaseband the option to choose 3-DH5 packets, but is small enough for\nERTM traffic to interleave well with other L2CAP or SCO data.\n672-byte payloads do not allow the most efficient over-the-air\npacket choice, and cannot achieve maximum throughput over BR/EDR.\n\nSigned-off-by: Mat Martineau \u003cmathewm@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "fa235562fbde8703aabeeedfa0772f08608d1542", "tree": "96b982350dfafe19bb30dff3fd842a26fe16c328", "parents": [ "86b1b26326279299c93ddb11ab4782d3896bf84c" ], "author": { "name": "Mat Martineau", "email": "mathewm@codeaurora.org", "time": "Thu Aug 05 15:54:20 2010 -0700" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Tue Aug 10 07:59:11 2010 -0400" }, "message": "Bluetooth: Change default L2CAP ERTM retransmit timeout\n\nThe L2CAP specification requires that the ERTM retransmit timeout be at\nleast 2 seconds for BR/EDR connections.\n\nSigned-off-by: Mat Martineau \u003cmathewm@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "53c3fa206415d8a3f8b2a4f77689ea044c4a9c65", "tree": "9503d3a9aad8472117db2bc358fdc2e822295b1f", "parents": [ "7ed24e8da75615418cbf3417e421053e53a5f5b3" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Mon Aug 09 13:41:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 10 00:09:20 2010 -0700" }, "message": "net/sock.h: add missing kernel-doc notation\n\nAdd missing kernel-doc notation to struct sock:\n\nWarning(include/net/sock.h:324): No description found for parameter \u0027sk_peer_pid\u0027\nWarning(include/net/sock.h:324): No description found for parameter \u0027sk_peer_cred\u0027\nWarning(include/net/sock.h:324): No description found for parameter \u0027sk_classid\u0027\nWarning(include/net/sock.h:324): Excess struct/union/enum/typedef member \u0027sk_peercred\u0027 description in \u0027sock\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e225567960db50e9810a152c8621c7a6ed94de71", "tree": "d0129e2988f8aea56d4f00f04c4818c2e8cc07a2", "parents": [ "4b030d4288a569d6bdeca884d7f102d951f097f2", "a24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 06 13:30:43 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Aug 06 13:30:43 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "c0068c85897f06205d4c35cf4bf9161be90690e9", "tree": "ae8a186fff44a29454008a5d1f5891b10a861f2c", "parents": [ "2411054ae9eb7e7ef488a39912abfc4ebadbe3ad", "adb08edea0119f7a5484a9f6a385fbcecdf85a63" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 05 15:54:28 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 05 15:54:28 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6\n" }, { "commit": "6ba74014c1ab0e37af7de6f64b4eccbbae3cb9e7", "tree": "8f3892fc44f1e403675a6d7e88fda5c70e56ee4c", "parents": [ "5abd9ccced7a726c817dd6b5b96bc933859138d1", "3ff1c25927e3af61c6bf0e4ed959504058ae4565" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 11:47:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 04 11:47:58 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits)\n phy/marvell: add 88ec048 support\n igb: Program MDICNFG register prior to PHY init\n e1000e: correct MAC-PHY interconnect register offset for 82579\n hso: Add new product ID\n can: Add driver for esd CAN-USB/2 device\n l2tp: fix export of header file for userspace\n can-raw: Fix skb_orphan_try handling\n Revert \"net: remove zap_completion_queue\"\n net: cleanup inclusion\n phy/marvell: add 88e1121 interface mode support\n u32: negative offset fix\n net: Fix a typo from \"dev\" to \"ndev\"\n igb: Use irq_synchronize per vector when using MSI-X\n ixgbevf: fix null pointer dereference due to filter being set for VLAN 0\n e1000e: Fix irq_synchronize in MSI-X case\n e1000e: register pm_qos request on hardware activation\n ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice\n net: Add getsockopt support for TCP thin-streams\n cxgb4: update driver version\n cxgb4: add new PCI IDs\n ...\n\nManually fix up conflicts in:\n - drivers/net/e1000e/netdev.c: due to pm_qos registration\n infrastructure changes\n - drivers/net/phy/marvell.c: conflict between adding 88ec048 support\n and cleaning up the IDs\n - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req\n conflict (registration change vs marking it static)\n" }, { "commit": "83bf2e4089bebc2c7fd14a79de5954b26fe8d4af", "tree": "ab2cb1f229ba4c2d7236406c997e41a223daf74d", "parents": [ "de38483010bae523f533bb6bf9f7b7353772f6eb", "6661481d5a8975657742c7ed40ae16bdaa7d0a6e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 15:07:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 15:07:58 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "eda25e46161527845572131b37706a458d9270ef", "tree": "b8a68c9185f7f53a135422a41dc68ef2c5f527ee", "parents": [ "0ef63f345c48afe5896c5cffcba57f0457d409b9" ], "author": { "name": "Aneesh Kumar K.V", "email": "aneesh.kumar@linux.vnet.ibm.com", "time": "Mon May 31 13:22:50 2010 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:28:34 2010 -0500" }, "message": "net/9p: Implement TXATTRCREATE 9p call\n\nTXATTRCREATE: Prepare a fid for setting xattr value on a file system object.\n\n size[4] TXATTRCREATE tag[2] fid[4] name[s] attr_size[8] flags[4]\n size[4] RXATTRCREATE tag[2]\n\ntxattrcreate gets a fid pointing to xattr. This fid can later be\nused to set the xattr value.\n\nflag value is derived from set Linux setxattr. The manpage says\n\"The flags parameter can be used to refine the semantics of the operation.\nXATTR_CREATE specifies a pure create, which fails if the named attribute\nexists already. XATTR_REPLACE specifies a pure replace operation, which\nfails if the named attribute does not already exist. By default (no flags),\nthe extended attribute will be created if need be, or will simply replace\nthe value if the attribute exists.\"\n\nThe actual setxattr operation happens when the fid is clunked. At that point\nthe written byte count and the attr_size specified in TXATTRCREATE should be\nsame otherwise an error will be returned.\n\nSigned-off-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "0ef63f345c48afe5896c5cffcba57f0457d409b9", "tree": "b02ca26b3d74d998a6e609a9abd9a753d0ab8075", "parents": [ "ef56547efa3c88609069e2a91f46e25c31dd536e" ], "author": { "name": "Aneesh Kumar K.V", "email": "aneesh.kumar@linux.vnet.ibm.com", "time": "Mon May 31 13:22:45 2010 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:28:33 2010 -0500" }, "message": "net/9p: Implement attrwalk 9p call\n\nTXATTRWALK: Descend a ATTR namespace\n\n size[4] TXATTRWALK tag[2] fid[4] newfid[4] name[s]\n size[4] RXATTRWALK tag[2] size[8]\n\ntxattrwalk gets a fid pointing to xattr. This fid can later be\nused to read the xattr value. If name is NULL the fid returned\ncan be used to get the list of extended attribute associated to\nthe file system object.\n\nSigned-off-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "ef56547efa3c88609069e2a91f46e25c31dd536e", "tree": "802bb98048ae36e59fc0bcaa21bd54e5ebf9de99", "parents": [ "5643135a28464e7c19d8d23a9e0804697a62c84b" ], "author": { "name": "M. Mohan Kumar", "email": "mohan@in.ibm.com", "time": "Tue Jun 22 19:47:50 2010 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:28:32 2010 -0500" }, "message": "9p: Implement LOPEN\n\nImplement 9p2000.L version of open(LOPEN) interface in 9p client.\n\nFor LOPEN, no need to convert the flags to and from 9p mode to VFS mode.\n\nSynopsis:\n\n size[4] Tlopen tag[2] fid[4] mode[4]\n\n size[4] Rlopen tag[2] qid[13] iounit[4]\n\n[Fix mode bit format - jvrao@linux.vnet.ibm.com]\n\nSigned-off-by: M. Mohan Kumar \u003cmohan@in.ibm.com\u003e\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbegren \u003cericvh@gmail.com\u003e\n" }, { "commit": "5643135a28464e7c19d8d23a9e0804697a62c84b", "tree": "d7141110fab0f3d71a95fe18b0b77cbaca645c80", "parents": [ "01a622bd7409bb7af38e784cff814e5e723f7951" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Thu Jun 17 18:27:46 2010 -0700" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:28:32 2010 -0500" }, "message": "fs/9p: This patch implements TLCREATE for 9p2000.L protocol.\n\nSYNOPSIS\n\n size[4] Tlcreate tag[2] fid[4] name[s] flags[4] mode[4] gid[4]\n\n size[4] Rlcreate tag[2] qid[13] iounit[4]\n\nDESCRIPTION\n\nThe Tlreate request asks the file server to create a new regular file with the\nname supplied, in the directory (dir) represented by fid.\nThe mode argument specifies the permissions to use. New file is created with\nthe uid if the fid and with supplied gid.\n\nThe flags argument represent Linux access mode flags with which the caller\nis requesting to open the file with. Protocol allows all the Linux access\nmodes but it is upto the server to allow/disallow any of these acess modes.\nIf the server doesn\u0027t support any of the access mode, it is expected to\nreturn error.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "01a622bd7409bb7af38e784cff814e5e723f7951", "tree": "1b6e0d9806e560d7f89e0efa8981cfba4c213361", "parents": [ "4b43516ab19b748b48322937fd9307af17541c4d" ], "author": { "name": "M. Mohan Kumar", "email": "mohan@in.ibm.com", "time": "Wed Jun 16 14:27:22 2010 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:28:31 2010 -0500" }, "message": "9p: Implement TMKDIR\n\nImplement TMKDIR as part of 2000.L Work\n\nSynopsis\n\n size[4] Tmkdir tag[2] fid[4] name[s] mode[4] gid[4]\n\n size[4] Rmkdir tag[2] qid[13]\n\nDescription\n\n mkdir asks the file server to create a directory with given name,\n mode and gid. The qid for the new directory is returned with\n the mkdir reply message.\n\nNote: 72 is selected as the opcode for TMKDIR from the reserved list.\n\nSigned-off-by: M. Mohan Kumar \u003cmohan@in.ibm.com\u003e\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "4b43516ab19b748b48322937fd9307af17541c4d", "tree": "0ab84e8d69abce9d63e1937b1a807d2243444a01", "parents": [ "50cc42ff3d7bc48a436c5a0413459ca7841b505f" ], "author": { "name": "M. Mohan Kumar", "email": "mohan@in.ibm.com", "time": "Wed Jun 16 14:27:01 2010 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:28:30 2010 -0500" }, "message": "9p: Implement TMKNOD\n\nSynopsis\n\n size[4] Tmknod tag[2] fid[4] name[s] mode[4] major[4] minor[4] gid[4]\n\n size[4] Rmknod tag[2] qid[13]\n\nDescription\n\n mknod asks the file server to create a device node with given major and\n minor number, mode and gid. The qid for the new device node is returned\n with the mknod reply message.\n\n[sripathik@in.ibm.com: Fix error handling code]\n\nSigned-off-by: M. Mohan Kumar \u003cmohan@in.ibm.com\u003e\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "50cc42ff3d7bc48a436c5a0413459ca7841b505f", "tree": "7209ab2807e3a284c1fbd36dd885e34b81809b0d", "parents": [ "652df9a7fd03cb47a3f663f0c08a2bd086505e9b" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Wed Jun 09 15:59:31 2010 -0700" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:28:29 2010 -0500" }, "message": "9p: Define and implement TSYMLINK for 9P2000.L\n\nCreate a symbolic link\n\nSYNOPSIS\n\nsize[4] Tsymlink tag[2] fid[4] name[s] symtgt[s] gid[4]\n\nsize[4] Rsymlink tag[2] qid[13]\n\nDESCRIPTION\n\nCreate a symbolic link named \u0027name\u0027 pointing to \u0027symtgt\u0027.\ngid represents the effective group id of the caller.\nThe permissions of a symbolic link are irrelevant hence it is omitted\nfrom the protocol.\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nReviewed-by: Sripathi Kodi \u003csripathik@in.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "652df9a7fd03cb47a3f663f0c08a2bd086505e9b", "tree": "af90ae0762a8770e660b4cbb23f7e9225cd5dba7", "parents": [ "09d34ee5f93b2e53b64ffba27bc18731e31154e1" ], "author": { "name": "Venkateswararao Jujjuri (JV)", "email": "jvrao@linux.vnet.ibm.com", "time": "Thu Jun 03 15:16:59 2010 -0700" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:28:25 2010 -0500" }, "message": "9p: Define and implement TLINK for 9P2000.L\n\nThis patch adds a helper function to get the dentry from inode and\nuses it in creating a Hardlink\n\nSYNOPSIS\n\nsize[4] Tlink tag[2] dfid[4] oldfid[4] newpath[s]\n\nsize[4] Rlink tag[2]\n\nDESCRIPTION\n\nCreate a link \u0027newpath\u0027 in directory pointed by dfid linking to oldfid path.\n\n[sripathik@in.ibm.com : p9_client_link should not free req structure\nif p9_client_rpc has returned an error.]\n\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "87d7845aa0b157a62448dd3e339856f28befe1f4", "tree": "bae5a5449f4bdb5ccfd1edcb99b285708c123e9f", "parents": [ "f085312204f384a0277a66c3c48ba8f9edcd58f2" ], "author": { "name": "Sripathi Kodi", "email": "sripathik@in.ibm.com", "time": "Fri Jun 18 11:50:10 2010 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:25:10 2010 -0500" }, "message": "9p: Implement client side of setattr for 9P2000.L protocol.\n\n SYNOPSIS\n\n size[4] Tsetattr tag[2] attr[n]\n\n size[4] Rsetattr tag[2]\n\n DESCRIPTION\n\n The setattr command changes some of the file status information.\n attr resembles the iattr structure used in Linux kernel. It\n specifies which status parameter is to be changed and to what\n value. It is laid out as follows:\n\n valid[4]\n specifies which status information is to be changed. Possible\n values are:\n ATTR_MODE (1 \u003c\u003c 0)\n ATTR_UID (1 \u003c\u003c 1)\n ATTR_GID (1 \u003c\u003c 2)\n ATTR_SIZE (1 \u003c\u003c 3)\n ATTR_ATIME (1 \u003c\u003c 4)\n ATTR_MTIME (1 \u003c\u003c 5)\n ATTR_ATIME_SET (1 \u003c\u003c 7)\n ATTR_MTIME_SET (1 \u003c\u003c 8)\n\n The last two bits represent whether the time information\n is being sent by the client\u0027s user space. In the absense\n of these bits the server always uses server\u0027s time.\n\n mode[4]\n File permission bits\n\n uid[4]\n Owner id of file\n\n gid[4]\n Group id of the file\n\n size[8]\n File size\n\n atime_sec[8]\n Time of last file access, seconds\n\n atime_nsec[8]\n Time of last file access, nanoseconds\n\n mtime_sec[8]\n Time of last file modification, seconds\n\n mtime_nsec[8]\n Time of last file modification, nanoseconds\n\nExplanation of the patches:\n--------------------------\n\n*) The kernel just copies relevent contents of iattr structure to\n p9_iattr_dotl structure and passes it down to the client. The\n only check it has is calling inode_change_ok()\n*) The p9_iattr_dotl structure does not have ctime and ia_file\n parameters because I don\u0027t think these are needed in our case.\n The client user space can request updating just ctime by calling\n chown(fd, -1, -1). This is handled on server side without a need\n for putting ctime on the wire.\n*) The server currently supports changing mode, time, ownership and\n size of the file.\n*) 9P RFC says \"Either all the changes in wstat request happen, or\n none of them does: if the request succeeds, all changes were made;\n if it fails, none were.\"\n I have not done anything to implement this specifically because I\n don\u0027t see a reason.\n\nSigned-off-by: Sripathi Kodi \u003csripathik@in.ibm.com\u003e\nSigned-off-by: Venkateswararao Jujjuri \u003cjvrao@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "f085312204f384a0277a66c3c48ba8f9edcd58f2", "tree": "33006860cc1cd4338de56ba1a9915ed95082814e", "parents": [ "9ffaf63e34821ea60b2e1c8593f968d73728f82b" ], "author": { "name": "Sripathi Kodi", "email": "sripathik@in.ibm.com", "time": "Mon Jul 12 20:07:23 2010 +0530" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:25:09 2010 -0500" }, "message": "9p: getattr client implementation for 9P2000.L protocol.\n\n SYNOPSIS\n\n size[4] Tgetattr tag[2] fid[4] request_mask[8]\n\n size[4] Rgetattr tag[2] lstat[n]\n\n DESCRIPTION\n\n The getattr transaction inquires about the file identified by fid.\n request_mask is a bit mask that specifies which fields of the\n stat structure is the client interested in.\n\n The reply will contain a machine-independent directory entry,\n laid out as follows:\n\n st_result_mask[8]\n Bit mask that indicates which fields in the stat structure\n have been populated by the server\n\n qid.type[1]\n the type of the file (directory, etc.), represented as a bit\n vector corresponding to the high 8 bits of the file\u0027s mode\n word.\n\n qid.vers[4]\n version number for given path\n\n qid.path[8]\n the file server\u0027s unique identification for the file\n\n st_mode[4]\n Permission and flags\n\n st_uid[4]\n User id of owner\n\n st_gid[4]\n Group ID of owner\n\n st_nlink[8]\n Number of hard links\n\n st_rdev[8]\n Device ID (if special file)\n\n st_size[8]\n Size, in bytes\n\n st_blksize[8]\n Block size for file system IO\n\n st_blocks[8]\n Number of file system blocks allocated\n\n st_atime_sec[8]\n Time of last access, seconds\n\n st_atime_nsec[8]\n Time of last access, nanoseconds\n\n st_mtime_sec[8]\n Time of last modification, seconds\n\n st_mtime_nsec[8]\n Time of last modification, nanoseconds\n\n st_ctime_sec[8]\n Time of last status change, seconds\n\n st_ctime_nsec[8]\n Time of last status change, nanoseconds\n\n st_btime_sec[8]\n Time of creation (birth) of file, seconds\n\n st_btime_nsec[8]\n Time of creation (birth) of file, nanoseconds\n\n st_gen[8]\n Inode generation\n\n st_data_version[8]\n Data version number\n\n request_mask and result_mask bit masks contain the following bits\n #define P9_STATS_MODE 0x00000001ULL\n #define P9_STATS_NLINK 0x00000002ULL\n #define P9_STATS_UID 0x00000004ULL\n #define P9_STATS_GID 0x00000008ULL\n #define P9_STATS_RDEV 0x00000010ULL\n #define P9_STATS_ATIME 0x00000020ULL\n #define P9_STATS_MTIME 0x00000040ULL\n #define P9_STATS_CTIME 0x00000080ULL\n #define P9_STATS_INO 0x00000100ULL\n #define P9_STATS_SIZE 0x00000200ULL\n #define P9_STATS_BLOCKS 0x00000400ULL\n\n #define P9_STATS_BTIME 0x00000800ULL\n #define P9_STATS_GEN 0x00001000ULL\n #define P9_STATS_DATA_VERSION 0x00002000ULL\n\n #define P9_STATS_BASIC 0x000007ffULL\n #define P9_STATS_ALL 0x00003fffULL\n\n This patch implements the client side of getattr implementation for\n 9P2000.L. It introduces a new structure p9_stat_dotl for getting\n Linux stat information along with QID. The data layout is similar to\n stat structure in Linux user space with the following major\n differences:\n\n inode (st_ino) is not part of data. Instead qid is.\n\n device (st_dev) is not part of data because this doesn\u0027t make sense\n on the client.\n\n All time variables are 64 bit wide on the wire. The kernel seems to use\n 32 bit variables for these variables. However, some of the architectures\n have used 64 bit variables and glibc exposes 64 bit variables to user\n space on some architectures. Hence to be on the safer side we have made\n these 64 bit in the protocol. Refer to the comments in\n include/asm-generic/stat.h\n\n There are some additional fields: st_btime_sec, st_btime_nsec, st_gen,\n st_data_version apart from the bitmask, st_result_mask. The bit mask\n is filled by the server to indicate which stat fields have been\n populated by the server. Currently there is no clean way for the\n server to obtain these additional fields, so it sends back just the\n basic fields.\n\nSigned-off-by: Sripathi Kodi \u003csripathik@in.ibm.com\u003e\nSigned-off-by: Eric Van Hensbegren \u003cericvh@gmail.com\u003e\n" }, { "commit": "7751bdb3a095ad32dd4fcff3443cf8dd4cb1e748", "tree": "6c7a93a546e34d86e433a1be05e3ebfcc4f77754", "parents": [ "97e8442b0971ea6be9a495b3d03402985cfe5d6a" ], "author": { "name": "Sripathi Kodi", "email": "sripathik@in.ibm.com", "time": "Fri Jun 04 13:41:26 2010 +0000" }, "committer": { "name": "Eric Van Hensbergen", "email": "ericvh@gmail.com", "time": "Mon Aug 02 14:25:07 2010 -0500" }, "message": "9p: readdir implementation for 9p2000.L\n\nThis patch implements the kernel part of readdir() implementation for 9p2000.L\n\n Change from V3: Instead of inode, server now sends qids for each dirent\n\n SYNOPSIS\n\n size[4] Treaddir tag[2] fid[4] offset[8] count[4]\n size[4] Rreaddir tag[2] count[4] data[count]\n\n DESCRIPTION\n\n The readdir request asks the server to read the directory specified by \u0027fid\u0027\n at an offset specified by \u0027offset\u0027 and return as many dirent structures as\n possible that fit into count bytes. Each dirent structure is laid out as\n follows.\n\n qid.type[1]\n the type of the file (directory, etc.), represented as a bit\n vector corresponding to the high 8 bits of the file\u0027s mode\n word.\n\n qid.vers[4]\n version number for given path\n\n qid.path[8]\n the file server\u0027s unique identification for the file\n\n offset[8]\n offset into the next dirent.\n\n type[1]\n type of this directory entry.\n\n name[256]\n name of this directory entry.\n\n This patch adds v9fs_dir_readdir_dotl() as the readdir() call for 9p2000.L.\n This function sends P9_TREADDIR command to the server. In response the server\n sends a buffer filled with dirent structures. This is different from the\n existing v9fs_dir_readdir() call which receives stat structures from the server.\n This results in significant speedup of readdir() on large directories.\n For example, doing \u0027ls \u003e/dev/null\u0027 on a directory with 10000 files on my\n laptop takes 1.088 seconds with the existing code, but only takes 0.339 seconds\n with the new readdir.\n\nSigned-off-by: Sripathi Kodi \u003csripathik@in.ibm.com\u003e\nReviewed-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nSigned-off-by: Eric Van Hensbergen \u003cericvh@gmail.com\u003e\n" }, { "commit": "f43dc98b3be36551143e3bbaf1bb3067835c24f4", "tree": "65d157024f399f49f8798ab9f905d66dc4f11a52", "parents": [ "794dbc1d712e181a9eb8d1ae799ed7c526963a7c" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Mon Aug 02 17:20:54 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Aug 02 17:20:54 2010 +0200" }, "message": "netfilter: nf_nat: make unique_tuple return void\n\nThe only user of unique_tuple() get_unique_tuple() doesn\u0027t care about the\nreturn value of unique_tuple(), so make unique_tuple() return void (nothing).\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "5c0d2374a16fcb52096df914ee57720987677be5", "tree": "fe69482186b9a4fe208c18fffbf2c791718d0557", "parents": [ "2890a1573d1ae859a4d77e2fdbecacf21f96c0db" ], "author": { "name": "Simon Horman", "email": "horms@verge.net.au", "time": "Mon Aug 02 17:12:44 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Aug 02 17:12:44 2010 +0200" }, "message": "ipvs: provide default ip_vs_conn_{in,out}_get_proto\n\nThis removes duplicate code by providing a default implementation\nwhich is used by 3 of the 4 modules that provide these call.\n\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "ee92d37861a90b8f14fa621ae5abcfb29a89aaa9", "tree": "ead832fad372e9802d51914ebd6a8f3ce8edd4ce", "parents": [ "24b36f0193467fa727b85b4c004016a8dae999b9" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Mon Aug 02 17:06:19 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Mon Aug 02 17:06:19 2010 +0200" }, "message": "netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist()\n\nsome users of nf_ct_ext_exist() know ct-\u003eext isn\u0027t NULL. For these users, the\ncheck for ct-\u003eext isn\u0027t necessary, the function __nf_ct_ext_exist() can be\nused instead.\n\nthe type of the return value of nf_ct_ext_exist() is changed to bool.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "ea4bd8ba804dedefa65303b3bd105d6d2808e621", "tree": "4a189e6c27629892ce9d8b99566ca823e7502b47", "parents": [ "b7753c8cd51dce67a0b152efb456a21ff1cc241b" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Fri Jul 30 21:54:49 2010 -0700" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Sat Jul 31 16:06:58 2010 -0700" }, "message": "Bluetooth: Use list_head for HCI blacklist head\n\nThe bdaddr in the list root is completely unused and just\ntaking up space.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nTested-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "ae3568adf42d5d3bb3cfa505b94351c5d1ce4924", "tree": "112865a6e6b1e4ddf70362f3efb295c495ec85b9", "parents": [ "7f3e01fee41a322747db2d7574516d9fbd3785c0", "b7753c8cd51dce67a0b152efb456a21ff1cc241b" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 29 14:47:07 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 29 14:47:07 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem\n" }, { "commit": "b7753c8cd51dce67a0b152efb456a21ff1cc241b", "tree": "b322f9c97317be44435d4ffe798e9550f2d9f0e6", "parents": [ "e5b900d228b76d445a4240d9aeb3cd8f79205a91" ], "author": { "name": "Christian Lamparter", "email": "chunkeey@googlemail.com", "time": "Thu Jul 29 01:28:46 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 29 12:55:00 2010 -0400" }, "message": "cfg80211: fix dev \u003c-\u003e wiphy typo\n\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Christian Lamparter \u003cchunkeey@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e5b900d228b76d445a4240d9aeb3cd8f79205a91", "tree": "dffa32e827e2d6e5388430ae5ec732f0ca023b11", "parents": [ "d28232b461b8d54b09e59325dbac8b0913ce2049" ], "author": { "name": "Johannes Berg", "email": "johannes.berg@intel.com", "time": "Thu Jul 29 16:08:55 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 29 12:55:00 2010 -0400" }, "message": "mac80211: allow drivers to request DTIM period\n\nSome features require knowing the DTIM period\nbefore associating. This implements the ability\nto wait for a beacon in mac80211 before assoc\nto provide this value. It is optional since\nmost likely not all drivers will need this.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4552124543141debf40a94b67155e57aa6bb34d6", "tree": "c2080f8be1a08c92a40bb05464800c05d4806152", "parents": [ "a0daa0e7592ada797d6835f11529097aabc27ad2" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Wed Jul 28 02:40:49 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 28 16:24:02 2010 -0400" }, "message": "mac80211: inform drivers about the off-channel status on channel changes\n\nFor some drivers it can be useful to know whether the channel they\u0027re\nsupposed to switch to is going to be used for short off-channel work or\nscanning, or whether the hardware is expected to stay on it for a while\nlonger. This is important for various kinds of calibration work, which\ntakes longer to complete and should keep some persistent state, even if\nthe channel temporarily changes.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "099284bdecf6e0af78662371ed3f45b71d796aad", "tree": "90c336885d8dd6daf46ea4b94f71bb8f986b5ba9", "parents": [ "073730d771d97bb5bbef080bd5d6d0a5af7cba7d", "4ebaa4edf8799cab19d5a0642dc95f04fd284e06" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 28 16:17:49 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jul 28 16:17:49 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6\n" }, { "commit": "bb7e95c8fd859922c6cf3ebbb3a8546007df1748", "tree": "58b54c6306ba168b76f25cc6dc9a2d1d2eb830a7", "parents": [ "b8bc0421ab7f83712a0a8ef7eb05fa73ec53c027", "5447080cfa3c77154498dfbf225367ac85b4c2b5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 27 21:01:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 27 21:01:35 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x_main.c\n\nMerge bnx2x bug fixes in by hand... :-/\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e73439d8c0e4c522c843b8bb98c0eb5700da6b05", "tree": "0ca070acc02700061380bd40315e39684b3e59fa", "parents": [ "800f65bba8d2030b3fef62850e203f9f176625a8" ], "author": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Mon Jul 26 10:06:00 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Tue Jul 27 12:29:04 2010 -0700" }, "message": "Bluetooth: Defer SCO setup if mode change is pending\n\nCertain headsets such as the Motorola H350 will reject SCO and eSCO\nconnection requests while the ACL is transitioning from sniff mode\nto active mode. Add synchronization so that SCO and eSCO connection\nrequests will wait until the ACL has fully transitioned to active mode.\n\n\u003c HCI Command: Exit Sniff Mode (0x02|0x0004) plen 2\n handle 12\n\u003e HCI Event: Command Status (0x0f) plen 4\n Exit Sniff Mode (0x02|0x0004) status 0x00 ncmd 1\n\u003c HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17\n handle 12 voice setting 0x0040\n\u003e HCI Event: Command Status (0x0f) plen 4\n Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1\n\u003e HCI Event: Number of Completed Packets (0x13) plen 5\n handle 12 packets 1\n\u003e HCI Event: Mode Change (0x14) plen 6\n status 0x00 handle 12 mode 0x00 interval 0\n Mode: Active\n\u003e HCI Event: Synchronous Connect Complete (0x2c) plen 17\n status 0x10 handle 14 bdaddr 00:1A:0E:50:28:A4 type SCO\n Error: Connection Accept Timeout Exceeded\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "073730d771d97bb5bbef080bd5d6d0a5af7cba7d", "tree": "711dc85fa6253408de4fe0766ea1b8219fd6c034", "parents": [ "903c99d8d6d055c56e7fdfba4602c05e357fa186" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jul 26 14:40:00 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 27 15:14:13 2010 -0400" }, "message": "wireless: Convert wiphy_debug macro to function\n\nSave a few bytes of text\n\n(allyesconfig)\n$ size drivers/net/wireless/built-in.o*\n text\t data\t bss\t dec\t hex\tfilename\n3924568\t 100548\t 871056\t4896172\t 4ab5ac\tdrivers/net/wireless/built-in.o.new\n3926520\t 100548\t 871464\t4898532\t 4abee4\tdrivers/net/wireless/built-in.o.old\n\n$ size net/wireless/core.o*\n text\t data\t bss\t dec\t hex\tfilename\n 12843\t 216\t 3768\t 16827\t 41bb\tnet/wireless/core.o.new\n 12328\t 216\t 3656\t 16200\t 3f48\tnet/wireless/core.o\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "e1db74fcc3d95c8a051ec457241b5aa65a01a603", "tree": "4165af9c4cb369a806fc34e50a24a6378f5a123f", "parents": [ "97c5e2756e3f0711877c5b6f2323151964229260" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jul 26 14:39:57 2010 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 27 15:14:13 2010 -0400" }, "message": "include/net/cfg80211.h: Add wiphy_\u003clevel\u003e printk equivalents\n\nSimplify logging messages for wiphy devices\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "800f65bba8d2030b3fef62850e203f9f176625a8", "tree": "6507c4fe7a0826c253b4afb29375ab306a0fd9c8", "parents": [ "06b3cda0c12986f5bba578b918b188d731c4e191", "b3190df628617c7a4f188a9465aeabe1f5761933" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 27 11:59:19 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 27 11:59:19 2010 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-commands.h\n" }, { "commit": "3289a8368c294726659588d044e354dd3bcf44b3", "tree": "e7e534dbbeb1f4c8e73c329cbd0956d65f3147d4", "parents": [ "ea65145da88e9fa04cb15c7a2a550ad1d3fde02a" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 22 16:31:48 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jul 26 15:09:04 2010 -0400" }, "message": "lib80211: remove unused host_build_iv option\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "3b87956ea645fb4de7e59c7d0aa94de04be72615", "tree": "0dde04e6dfad7cd76afbb31eff72a8f08a574a9c", "parents": [ "76ac21f5ef30e46397e405695eb1240ff0955209" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Thu Jul 22 18:45:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 24 21:04:20 2010 -0700" }, "message": "net sched: fix race in mirred device removal\n\nThis fixes hang when target device of mirred packet classifier\naction is removed.\n\nIf a mirror or redirection action is configured to cause packets\nto go to another device, the classifier holds a ref count, but was assuming\nthe adminstrator cleaned up all redirections before removing. The fix\nis to add a notifier and cleanup during unregister.\n\nThe new list is implicitly protected by RTNL mutex because\nit is held during filter add/delete as well as notifier.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2a88e7e559f2358f4e1422d0b0c0278a74136581", "tree": "b4e9e56dbde79fe7185cba511a1ffd85f5d2018e", "parents": [ "344e0f623cec5eba273db06fe57db080988d6b26", "7a17a33c0da37f8d24222c967550d19dabf13617" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 23 14:03:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 23 14:03:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-commands.h\n" }, { "commit": "7f1c407579519e71a0dcadc05614fd98acec585e", "tree": "623a63992113a539a3cd43031e58aad83f04bf34", "parents": [ "7b215ffc3885a38182d3d49ceb41d0a81c3e041a" ], "author": { "name": "Hannes Eder", "email": "heder@google.com", "time": "Fri Jul 23 12:48:52 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jul 23 12:48:52 2010 +0200" }, "message": "IPVS: make FTP work with full NAT support\n\nUse nf_conntrack/nf_nat code to do the packet mangling and the TCP\nsequence adjusting. The function \u0027ip_vs_skb_replace\u0027 is now dead\ncode, so it is removed.\n\nTo SNAT FTP, use something like:\n\n% iptables -t nat -A POSTROUTING -m ipvs --vaddr 192.168.100.30/32 \\\n --vport 21 -j SNAT --to-source 192.168.10.10\nand for the data connections in passive mode:\n\n% iptables -t nat -A POSTROUTING -m ipvs --vaddr 192.168.100.30/32 \\\n --vportctl 21 -j SNAT --to-source 192.168.10.10\nusing \u0027-m state --state RELATED\u0027 would also works.\n\nMake sure the kernel modules ip_vs_ftp, nf_conntrack_ftp, and\nnf_nat_ftp are loaded.\n\n[ up-port and minor fixes by Simon Horman \u003chorms@verge.net.au\u003e ]\nSigned-off-by: Hannes Eder \u003cheder@google.com\u003e\nSigned-off-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "3f30fc1570626f11e8f3efe5ebd41fe96e847ed1", "tree": "3a626c1887597942cd21202124b5e293dee226d5", "parents": [ "942875ffc102a6b9992120808e4990eda7a618f6" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jul 21 10:59:58 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 21 14:44:29 2010 -0700" }, "message": "net: remove last uses of __attribute__((packed))\n\nNetwork code uses the __packed macro instead of __attribute__((packed)).\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "942875ffc102a6b9992120808e4990eda7a618f6", "tree": "df529424969f797e016fc6b34f22f5993be31673", "parents": [ "2e4e7a97edcd58ce6e5be7cbb65fc4263f65e0bf" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Wed Jul 21 10:59:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 21 14:44:29 2010 -0700" }, "message": "irda: Use __packed annotation instead IRDA_PACKED macro\n\nRemove IRDA_PACKED macro, which maps to __attribute__((packed)). IRDA is\none of the last users of __attribute__((packet)). Networking code uses\n__packed now.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "66c853cc21bd387a9a2109dcf3b3d53cc9ee9edf", "tree": "7cff1a1c452f0cdd3420523b0f5f966900c2336a", "parents": [ "d1c4a17d58a6dfacb48935aa430aa986559a885f" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon Jul 19 02:00:13 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:13 2010 -0700" }, "message": "Bluetooth: Use __packed annotation\n\nTo make net/ and include/net/ code consistent use __packed instead of\n__attribute__ ((packed)). Bluetooth subsystem was one of the last net\nsubsys still using __attribute__ ((packed)).\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "5d8868ff3d11e3fc5a5c07477f281a16c71714a3", "tree": "60f6080cb5201bfcc59d32e189b9d10575fb04d3", "parents": [ "9981151086385eecc2febf4ba95a14593f834b3d" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Fri Jul 16 16:18:39 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:12 2010 -0700" }, "message": "Bluetooth: Add Google\u0027s copyright to L2CAP\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "9981151086385eecc2febf4ba95a14593f834b3d", "tree": "3cdda7fe4c3d5d3bf05e9ca6fb8f9f1b6ab1c226", "parents": [ "f39a3c06404d01ef2ce47e821bc778dfb1836df9" ], "author": { "name": "Suraj Sumangala", "email": "suraj@atheros.com", "time": "Wed Jul 14 13:02:19 2010 +0530" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:12 2010 -0700" }, "message": "Bluetooth: Implemented HCI frame reassembly for RX from stream\n\nImplemented frame reassembly implementation for reassembling fragments\nreceived from stream.\n\nSigned-off-by: Suraj Sumangala \u003csuraj@atheros.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "33e882a5f2301a23a85ef2994e30fd9f48d39d9b", "tree": "4048a954d11698581e123b25389a9f8f72125f90", "parents": [ "cd4c53919ed50b0d532f106aeb76e79077bece98" ], "author": { "name": "Suraj Sumangala", "email": "suraj@atheros.com", "time": "Wed Jul 14 13:02:17 2010 +0530" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:12 2010 -0700" }, "message": "Bluetooth: Implement hci_reassembly helper to reassemble RX packets\n\nImplements feature to reassemble received HCI frames from any input stream\n\nSigned-off-by: Suraj Sumangala \u003csuraj@atheros.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "cd4c53919ed50b0d532f106aeb76e79077bece98", "tree": "db669259c941d543a12014fc0d69103a4e368cea", "parents": [ "0a79f67445de50ca0a8dc1d34f3cc406d89c28b2" ], "author": { "name": "Suraj Sumangala", "email": "suraj@atheros.com", "time": "Wed Jul 14 13:02:16 2010 +0530" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:12 2010 -0700" }, "message": "Bluetooth: Add one more buffer for HCI stream reassembly\n\nAdditional reassembly buffer to keep track of stream reasembly\n\nSigned-off-by: Suraj Sumangala \u003csuraj@atheros.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "ce5706bd69be6b25715ed6cd48a210b5080032bc", "tree": "c542ca5952c691905f922869426be8d2a79f82fe", "parents": [ "be60b94030339b89c2bcff18c76882f0a4c01ce6" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Tue Jul 13 11:57:11 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:11 2010 -0700" }, "message": "Bluetooth: Add Copyright notice to L2CAP\n\nCopyright for the time I worked on L2CAP during the Google Summer of Code\nprogram.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "e0f66218b3a7d0bcf37ca95186123c257fda0ba5", "tree": "3b7972c417686f3bddbe69af5fdb8c6984c513ee", "parents": [ "8cb8e6f1684be13b51f8429b15f39c140326b327" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon Jun 21 18:50:49 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:09 2010 -0700" }, "message": "Bluetooth: Remove the send_lock spinlock from ERTM\n\nUsing a lock to deal with the ERTM race condition - interruption with\nnew data from the hci layer - is wrong. We should use the native skb\nbacklog queue.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "cf6c2c0b9f47ee3cd12684b905725c8376d52135", "tree": "0564fbf6b00891c810d8b91dbdb33c3e97ce1ce4", "parents": [ "2ba13ed678775195e8255b4e503c59d48b615bd8" ], "author": { "name": "Gustavo F. Padovan", "email": "padovan@profusion.mobi", "time": "Mon Jun 07 20:54:45 2010 -0300" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:09 2010 -0700" }, "message": "Bluetooth: Disconnect early if mode is not supported\n\nWhen mode is mandatory we shall not send connect request and report this\nto the userspace as well.\n\nSigned-off-by: Gustavo F. Padovan \u003cpadovan@profusion.mobi\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "2d0a03460a8a0c611843500735096ff799aa8510", "tree": "7de71ec848af910d0075a1175381015ded556fe6", "parents": [ "04fafe4ed76f5547856f4c464bec5bf948afb498" ], "author": { "name": "Ron Shaffer", "email": "rshaffer@codeaurora.org", "time": "Fri May 28 11:53:46 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:06 2010 -0700" }, "message": "Bluetooth: Reassigned copyright to Code Aurora Forum\n\nQualcomm, Inc. has reassigned rights to Code Aurora Forum. Accordingly,\nas files are modified by Code Aurora Forum members, the copyright\nstatement will be updated.\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "04fafe4ed76f5547856f4c464bec5bf948afb498", "tree": "6e16cc046b1686048efb36cb278b33ad7842f4dd", "parents": [ "7452d24cfb91e84f9be61beda5ad68d2a56d0938" ], "author": { "name": "Ron Shaffer", "email": "rshaffer@codeaurora.org", "time": "Fri May 28 11:53:45 2010 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:05 2010 -0700" }, "message": "Bluetooth: Remove extraneous white space\n\nDeleted extraneous white space from the end of several lines\n\nSigned-off-by: Ron Shaffer \u003crshaffer@codeaurora.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "f03585689fdff4ae256edd45a35bc2dd83d3684a", "tree": "be1516aa354aa742f2d5b69a91de0561febaffc4", "parents": [ "95ffa97827371ede501615d9bd048eb5b49e8fe1" ], "author": { "name": "Johan Hedberg", "email": "johan.hedberg@nokia.com", "time": "Tue May 18 13:20:32 2010 +0200" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Wed Jul 21 10:39:05 2010 -0700" }, "message": "Bluetooth: Add blacklist support for incoming connections\n\nIn some circumstances it could be desirable to reject incoming\nconnections on the baseband level. This patch adds this feature through\ntwo new ioctl\u0027s: HCIBLOCKADDR and HCIUNBLOCKADDR. Both take a simple\nBluetooth address as a parameter. BDADDR_ANY can be used with\nHCIUNBLOCKADDR to remove all devices from the blacklist.\n\nSigned-off-by: Johan Hedberg \u003cjohan.hedberg@nokia.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "11fe883936980fe242869d671092a466cf1db3e3", "tree": "14ff24e81eb4326e94eb5aa6432a1dd55cef5ece", "parents": [ "70d4bf6d467a330ccc947df9b2608e329d9e7708", "573201f36fd9c7c6d5218cdcd9948cee700b277d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 18:25:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 20 18:25:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/vhost/net.c\n\tnet/bridge/br_device.c\n\nFix merge conflict in drivers/vhost/net.c with guidance from\nStephen Rothwell.\n\nRevert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d\nsince net-next-2.6 has fixes that make bridge netpoll work properly thus\nwe don\u0027t need it disabled.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c28991a02caec1f3bfe4638ccf4e494c3e9418a3", "tree": "9cf993d74d59723673963877fc80379684e5e7ad", "parents": [ "3f6ff6bacdec217c98a60910c4804d11ce859820" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 20 12:22:40 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 20 16:49:37 2010 -0400" }, "message": "wireless: correct sparse warning in wext-compat.c\n\n CHECK net/wireless/wext-compat.c\nnet/wireless/wext-compat.c:1434:5: warning: symbol \u0027cfg80211_wext_siwpmksa\u0027 was not declared. Should it be static?\n\nAdd declaration in cfg80211.h. Also add an EXPORT_SYMBOL_GPL, since all\nthe peer functions have it.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4f366c5dabcb936dd5754a35188bd699181fe1ce", "tree": "1a35b5e9936554634fb36f3adb1bcbffef4a5375", "parents": [ "53e9b1de6840d9047f768878adcbd1d116f72aca" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jul 15 14:57:33 2010 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 20 16:44:35 2010 -0400" }, "message": "wireless: only use alpha2 regulatory information from country IE\n\nThe meaning and/or usage of the country IE is somewhat poorly defined.\nIn practice, this means that regulatory rulesets in a country IE are\noften incomplete and might be untrustworthy. This removes the code\nassociated with interpreting those rulesets while preserving respect\nfor country \"alpha2\" codes also contained in the country IE.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4ced3f74dae18715920cb680098ec7ff4345d0a3", "tree": "4a1b35285921fb25e01363af48a8c7db7423098d", "parents": [ "875ae5f68883c75aad826e715df8ec0619551a07" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Mon Jul 19 16:39:04 2010 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jul 20 16:02:58 2010 -0400" }, "message": "mac80211: move QoS-enable to BSS info\n\nEver since\n\ncommit e1b3ec1a2a336c328c336cfa5485a5f0484cc90d\nAuthor: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nDate: Mon Mar 29 12:18:34 2010 +0200\n\n mac80211: explicitly disable/enable QoS\n\nmac80211 is telling drivers, in particular\niwlwifi, whether QoS is enabled or not.\n\nHowever, this is only relevant for station mode,\nsince only then will any device send nullfunc\nframes and need to know whether they should be\nQoS frames or not. In other modes, there are\n(currently) no frames the device is supposed to\nsend.\n\nWhen you now consider virtual interfaces, it\nbecomes apparent that the current mechanism is\ninadequate since it enables/disables QoS on a\nglobal scale, where for nullfunc frames it has\nto be on a per-interface scale.\n\nDue to the above considerations, we can change\nthe way mac80211 advertises the QoS state to\ndrivers to only ever advertise it as \"off\" in\nstation mode, and make it a per-BSS setting.\n\nTested-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "f86586fa48a94c7a9c7f36650a2e0e4a947881c9", "tree": "d977100a3c72dcaeaeb90c0b776b36c2e8a57b90", "parents": [ "6ce28c6f55fe636c322ea909794cf19b20ef4b6b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Jul 15 21:41:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 15 21:41:00 2010 -0700" }, "message": "tcp: sizeof struct tcp_skb_cb is 44\n\nCorrect comment stating sizeof(struct tcp_skb_cb) is 36 or 40, since its\n44 bytes, since commit 951dbc8ac714b04 ([IPV6]: Move nextheader offset\nto the IP6CB).\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cca5cf91c789f3301cc2541a79c323c53be5a8e1", "tree": "dde344cf091b4ee2c5fd8ab238af5a0b18cb5918", "parents": [ "116e1f1b09dffe0ff8ebab73501324dca7bbbe5e" ], "author": { "name": "Pablo Neira Ayuso", "email": "pablo@netfilter.org", "time": "Thu Jul 15 11:27:41 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jul 15 11:27:41 2010 +0200" }, "message": "nfnetlink_log: do not expose NFULNL_COPY_DISABLED to user-space\n\nThis patch moves NFULNL_COPY_PACKET definition from\nlinux/netfilter/nfnetlink_log.h to net/netfilter/nfnetlink_log.h\nsince this copy mode is only for internal use.\n\nI have also changed the value from 0x03 to 0xff. Thus, we avoid\na gap from user-space that may confuse users if we add new\ncopy modes in the future.\n\nThis change was introduced in:\nhttp://www.spinics.net/lists/netfilter-devel/msg13535.html\n\nSince this change is not included in any stable Linux kernel,\nI think it\u0027s safe to make this change now. Anyway, this copy\nmode does not make any sense from user-space, so this patch\nshould not break any existing setup.\n\nSigned-off-by: Pablo Neira Ayuso \u003cpablo@netfilter.org\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "b0f77d0eae0c58a5a9691a067ada112ceeae2d00", "tree": "2bab159a95f51e32dbb4eb2d554328de3190c678", "parents": [ "91a72a70594e5212c97705ca6a694bd307f7a26b" ], "author": { "name": "Tom Herbert", "email": "therbert@google.com", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 14 20:50:29 2010 -0700" }, "message": "net: fix problem in reading sock TX queue\n\nFix problem in reading the tx_queue recorded in a socket. In\ndev_pick_tx, the TX queue is read by doing a check with\nsk_tx_queue_recorded on the socket, followed by a sk_tx_queue_get.\nThe problem is that there is not mutual exclusion across these\ncalls in the socket so it it is possible that the queue in the\nsock can be invalidated after sk_tx_queue_recorded is called so\nthat sk_tx_queue get returns -1, which sets 65535 in queue_index\nand thus dev_pick_tx returns 65536 which is a bogus queue and\ncan cause crash in dev_queue_xmit.\n\nWe fix this by only calling sk_tx_queue_get which does the proper\nchecks. The interface is that sk_tx_queue_get returns the TX queue\nif the sock argument is non-NULL and TX queue is recorded, else it\nreturns -1. sk_tx_queue_recorded is no longer used so it can be\ncompletely removed.\n\nSigned-off-by: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7ba42910073f8432934d61a6c08b1023c408fb62", "tree": "4f74648133eaf6cbea26d59c43d34e7153648f5d", "parents": [ "53d3176b282cc105493babb0fef36c8b873f6201" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jul 10 20:41:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:46 2010 -0700" }, "message": "inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()\n\na new boolean flag no_autobind is added to structure proto to avoid the autobind\ncalls when the protocol is TCP. Then sock_rps_record_flow() is called int the\nTCP\u0027s sendmsg() and sendpage() pathes.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_common.h | 4 ++++\n include/net/sock.h | 1 +\n include/net/tcp.h | 8 ++++----\n net/ipv4/af_inet.c | 15 +++++++++------\n net/ipv4/tcp.c | 11 +++++------\n net/ipv4/tcp_ipv4.c | 3 +++\n net/ipv6/af_inet6.c | 8 ++++----\n net/ipv6/tcp_ipv6.c | 3 +++\n 8 files changed, 33 insertions(+), 20 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "53d3176b282cc105493babb0fef36c8b873f6201", "tree": "2571bb37b0e292b7b2fbbd6b056661584260c9bf", "parents": [ "dbe000ed3f3033e8e6321d79023c827faf649c4d" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jul 10 20:41:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 12 20:21:45 2010 -0700" }, "message": "net: cleanups\n\nremove useless blanks.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_common.h | 55 ++++-------\n include/net/tcp.h | 222 +++++++++++++++++-----------------------------\n include/net/udp.h | 38 +++----\n 3 files changed, 123 insertions(+), 192 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "597e608a8492d662736c9bc6aa507dbf1cadc17d", "tree": "6c330cdd0a4809f67dd191b37e34f5b4318cef78", "parents": [ "acbc0f039ff4b93da737c91937b7c70018ded39f", "33b665eeeb85956ccbdf31c4c31a4e2a31133c44" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jul 07 15:59:38 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" }, { "commit": "e490c1defec4236a6a131fe2d13bf7ba787c02f8", "tree": "132325ca88cc86a74345a93b2774c5ca284b038a", "parents": [ "0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba", "4df53d8bab65cf2c18daebd51a5a4847e03f1943" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 22:42:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "f0796d5c73e59786d09a1e617689d1d415f2db44", "tree": "ecb17c65c5b6a162824a1e11fee24364852837f8", "parents": [ "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:57 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "net: decreasing real_num_tx_queues needs to flush qdisc\n\nReducing real_num_queues needs to flush the qdisc otherwise\nskbs with queue_mappings greater then real_num_tx_queues can\nbe sent to the underlying driver.\n\nThe flow for this is,\n\ndev_queue_xmit()\n\tdev_pick_tx()\n\t\tskb_tx_hash() \u003d\u003e hash using real_num_tx_queues\n\t\tskb_set_queue_mapping()\n\t...\n\tqdisc_enqueue_root() \u003d\u003e enqueue skb on txq from hash\n...\ndev-\u003ereal_num_tx_queues -\u003d n\n...\nsch_direct_xmit()\n\tdev_hard_start_xmit()\n\t\tndo_start_xmit(skb,dev) \u003d\u003e skb queue set with old hash\n\nskbs are enqueued on the qdisc with skb-\u003equeue_mapping set\n0 \u003c queue_mappings \u003c real_num_tx_queues. When the driver\ndecreases real_num_tx_queues skb\u0027s may be dequeued from the\nqdisc with a queue_mapping greater then real_num_tx_queues.\n\nThis fixes a case in ixgbe where this was occurring with DCB\nand FCoE. Because the driver is using queue_mapping to map\nskbs to tx descriptor rings we can potentially map skbs to\nrings that no longer exist.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nTested-by: Ross Brattain \u003cross.b.brattain@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ef6acff83222f4496ceef7d1f0ee9e50a5bb403", "tree": "0982d46258047f208c26068252457179f5f13bdf", "parents": [ "7ae80abdba0644e12ac17da567a2db1efc1bf8a8" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Thu Jul 01 13:21:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 02 21:59:07 2010 -0700" }, "message": "sched: qdisc_reset_all_tx is calling qdisc_reset without qdisc_lock\n\nWhen calling qdisc_reset() the qdisc lock needs to be held. In\nthis case there is at least one driver i4l which is using this\nwithout holding the lock. Add the locking here.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "05318bc905467237d4aa68a701f6e92a2b332218", "tree": "3b7577383bca50aeb442568aa16cf8f2167b8694", "parents": [ "ea812ca1b06113597adcd8e70c0f84a413d97544", "88c1f4f6dffe66e2fed8e7e3276e091ee850bed0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 01 17:34:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 01 17:34:14 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/libertas/host.h\n" }, { "commit": "d6bebca92c663fb216c072193945946f3807ca7f", "tree": "fd797f062fa19d2ee470cf33c9b475bff08e2545", "parents": [ "4ce3c183fcade7f4b30a33dae90cd774c3d9e094" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Tue Jun 29 04:39:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:44:29 2010 -0700" }, "message": "fragment: add fast path for in-order fragments\n\nadd fast path for in-order fragments\n\nAs the fragments are sent in order in most of OSes, such as Windows, Darwin and\nFreeBSD, it is likely the new fragments are at the end of the inet_frag_queue.\nIn the fast path, we check if the skb at the end of the inet_frag_queue is the\nprev we expect.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/inet_frag.h | 1 +\n net/ipv4/ip_fragment.c | 12 ++++++++++++\n net/ipv6/reassembly.c | 11 +++++++++++\n 3 files changed, 24 insertions(+)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4ce3c183fcade7f4b30a33dae90cd774c3d9e094", "tree": "84d5a130da50096fdbeb7fffea596dffe2cebd80", "parents": [ "f3eb62d2cc7da7bea4b394dd06f6bc738aa284e7" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 13:31:19 2010 -0700" }, "message": "snmp: 64bit ipstats_mib for all arches\n\n/proc/net/snmp and /proc/net/netstat expose SNMP counters.\n\nWidth of these counters is either 32 or 64 bits, depending on the size\nof \"unsigned long\" in kernel.\n\nThis means user program parsing these files must already be prepared to\ndeal with 64bit values, regardless of user program being 32 or 64 bit.\n\nThis patch introduces 64bit snmp values for IPSTAT mib, where some\ncounters can wrap pretty fast if they are 32bit wide.\n\n# netstat -s|egrep \"InOctets|OutOctets\"\n InOctets: 244068329096\n OutOctets: 244069348848\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "787a34456dc34bdd75b29cebb53cb09c727674d6", "tree": "370e65e5ea2536072c4067d600cdb6c4f3b7106a", "parents": [ "511d934f4496076898e45aaa09e0c85376eb16ee" ], "author": { "name": "Kulikov Vasiliy", "email": "segooon@gmail.com", "time": "Wed Jun 30 06:08:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 12:06:52 2010 -0700" }, "message": "net/neighbour.h: fix typo\n\n\u0027Shoul\u0027 must be \u0027should\u0027.\n\nSigned-off-by: Kulikov Vasiliy \u003csegooon@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4efd7e833591721bec21cc4730a7f6261417840f", "tree": "9982ea86ad73f1142842070f4d9d1bf83ba318a0", "parents": [ "d3ead2413cb99d3e6265577b12537434e229d8c2" ], "author": { "name": "Andreas Steffen", "email": "andreas.steffen@strongswan.org", "time": "Wed Jun 30 10:41:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 30 10:43:31 2010 -0700" }, "message": "xfrm: fix XFRMA_MARK extraction in xfrm_mark_get\n\nDetermine the size of the xfrm_mark struct, not of its pointer.\n\nSigned-off-by: Andreas Steffen \u003candreas.steffen@strongswan.org\u003e\nAcked-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "529d6dad5bc69de14cdd24831e2a14264e93daa4", "tree": "a89d7b8cdd3692e96a64c5d7196bcefc9f1e7f24", "parents": [ "01eebb53a65996dfbfb892bf5eb21ae831fbe3a6" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Tue Jun 29 00:08:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 00:08:21 2010 -0700" }, "message": "caif-driver: Add CAIF-SPI Protocol driver.\n\nThis patch introduces the CAIF SPI Protocol Driver for\nCAIF Link Layer.\n\nThis driver implements a platform driver to accommodate for a\nplatform specific SPI device. A general platform driver is not\npossible as there are no SPI Slave side Kernel API defined.\nA sample CAIF SPI Platform device can be found in\n.../Documentation/networking/caif/spi_porting.txt\n\nSigned-off-by: Sjur Braendeland \u003csjur.brandeland@stericsson.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "210d6de78c5d7c785fc532556cea340e517955e1", "tree": "e4bbac89a8bc16154f51ad61e140be1b7bd2b92d", "parents": [ "c4ead4c595cd54cf7b1a184d4f888ce0d7cce7d4" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jun 24 16:25:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 28 23:24:32 2010 -0700" }, "message": "act_mirred: don\u0027t clone skb when skb isn\u0027t shared\n\ndon\u0027t clone skb when skb isn\u0027t shared\n\nWhen the tcf_action is TC_ACT_STOLEN, and the skb isn\u0027t shared, we don\u0027t need\nto clone a new skb. As the skb will be freed after this function returns, we\ncan use it freely once we get a reference to it.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/sch_generic.h | 11 +++++++++--\n net/sched/act_mirred.c | 6 +++---\n 2 files changed, 12 insertions(+), 5 deletions(-)\nSigned-off-by: Jamal Hadi Salim \u003chadi@cyberus.ca\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "172d69e63c7f1e8300d0e1c1bbd8eb0f630faa15", "tree": "c71118ddc86186e235a920b9529c457db5e9aae5", "parents": [ "734f614bc1e7c6bf075d201f6bd9a555b8b4a984" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Mon Jun 21 11:48:45 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 22:00:03 2010 -0700" }, "message": "syncookies: add support for ECN\n\nAllows use of ECN when syncookies are in effect by encoding ecn_ok\ninto the syn-ack tcp timestamp.\n\nWhile at it, remove a uneeded #ifdef CONFIG_SYN_COOKIES.\nWith CONFIG_SYN_COOKIES\u003dnm want_cookie is ifdef\u0027d to 0 and gcc\nremoves the \"if (0)\".\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1823e4c80eeae2a774c75569ce3035070e5ee009", "tree": "bdc1bdf4a67027193312ad584924ca8a986a064c", "parents": [ "5eaa0bd81f93225b6d1972b373ed00ca763052b2" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 22 20:58:41 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 21:33:17 2010 -0700" }, "message": "snmp: add align parameter to snmp_mib_init()\n\nIn preparation for 64bit snmp counters for some mibs,\nadd an \u0027align\u0027 parameter to snmp_mib_init(), instead\nof assuming mibs only contain \u0027unsigned long\u0027 fields.\n\nCallers can use __alignof__(type) to provide correct\nalignment.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nCC: Arnaldo Carvalho de Melo \u003cacme@ghostprotocols.net\u003e\nCC: Hideaki YOSHIFUJI \u003cyoshfuji@linux-ipv6.org\u003e\nCC: Vlad Yasevich \u003cvladislav.yasevich@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8756201ba4189bca3ee1a6ec4e290f467ee09ab", "tree": "309d40a10f68ffc971de4f16d26d16a0dccc0693", "parents": [ "fe6fb552858f686f39e33d7b0a33fe56dacea0bf" ], "author": { "name": "Tim Gardner", "email": "tim.gardner@canonical.com", "time": "Fri Jun 25 14:44:07 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Fri Jun 25 14:44:07 2010 +0200" }, "message": "netfilter: xt_connbytes: Force CT accounting to be enabled\n\nCheck at rule install time that CT accounting is enabled. Force it\nto be enabled if not while also emitting a warning since this is not\nthe default state.\n\nThis is in preparation for deprecating CONFIG_NF_CT_ACCT upon which\nCONFIG_NETFILTER_XT_MATCH_CONNBYTES depended being set.\n\nAdded 2 CT accounting support functions:\n\nnf_ct_acct_enabled() - Get CT accounting state.\nnf_ct_set_acct() - Enable/disable CT accountuing.\n\nSigned-off-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nAcked-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "fa61cf70a6ae1089e459e4b59b2e8d8e90d8535e", "tree": "1bd81709faaa15fb207de7db4df1ceed96374208", "parents": [ "a185045c8da1ec6627236b4ade0d949b15da43b3" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 23 12:12:37 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Jun 24 15:42:33 2010 -0400" }, "message": "cfg80211/mac80211: Update set_tx_power to use mBm instead of dBm units\n\nIn preparation for a TX power setting interface in the nl80211, change the\n.set_tx_power function to use mBm units instead of dBm for greater accuracy and\nsmaller power levels.\n\nAlso, already in advance move the tx_power_setting enumeration to nl80211.\n\nThis change affects the .tx_set_power function prototype. As a result, the\ncorresponding changes are needed to modules using it. These are mac80211,\niwmc3200wifi and rndis_wlan.\n\nCc: Samuel Ortiz \u003csamuel.ortiz@intel.com\u003e\nCc: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nAcked-by: Samuel Ortiz \u003csamuel.ortiz@intel.com\u003e\nAcked-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "8244132ea89cdd128003f5b9980fab50d8d36d72", "tree": "c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95", "parents": [ "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd", "38000a94a902e94ca8b5498f7871c6316de8957a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 18:26:27 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/ipv4/ip_output.c\n" }, { "commit": "7b2ff18ee7b0ec4bc3162f821e221781aaca48bd", "tree": "eed7535663f6333a1dc68861d8cd7b98d8050d4d", "parents": [ "01fc3e86c6379cc4c78c529a1bad1b8179b726aa" ], "author": { "name": "Jiri Olsa", "email": "jolsa@redhat.com", "time": "Tue Jun 15 01:07:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 13:16:38 2010 -0700" }, "message": "net - IP_NODEFRAG option for IPv4 socket\n\nthis patch is implementing IP_NODEFRAG option for IPv4 socket.\nThe reason is, there\u0027s no other way to send out the packet with user\ncustomized header of the reassembly part.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1dc8d8c06d4002be4d1373fc06f25cd589be47e1", "tree": "c9e3a60ae07df56604f5e81a89900f6df975f102", "parents": [ "17f085df92ba74a4dc88744cbc7a699c231f8728" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Mon Jun 21 13:45:42 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 12:58:40 2010 -0700" }, "message": "net: Fix a typo in netlink.h\n\nFix a typo in include/net/netlink.h\nshould be finalize instead of finanlize\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f1c14b2e3b1805d3e9e6a306d07f5371ea703a7", "tree": "ad5d96e60d1ff4e91f5b23d7ae13884581ae2441", "parents": [ "8ceedea7c2600a1018d20f67e766c0773b59391a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 23 00:32:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:48:19 2010 -0700" }, "message": "snmp: fix SNMP_ADD_STATS()\n\ncommit aa2ea0586d9d (tcp: fix outsegs stat for TSO segments) incorrectly\nassumed SNMP_ADD_STATS() was used from BH context.\n\nFix this using mib[!in_softirq()] instead of mib[0]\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Tom Herbert \u003ctherbert@google.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f90754c15f47063671aea55268a9dd6a37b51492", "tree": "197c239a813e426d8a675449927e381352ad4875", "parents": [ "fb63bc41772259701a827e9a6117219a7393554f" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Mon Jun 21 08:59:39 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jun 21 15:39:59 2010 -0400" }, "message": "mac80211: Add interface for driver to temporarily disable dynamic ps\n\nThis mechanism introduced in this patch applies (at least) for hardware\ndesigns using a single shared antenna for both WLAN and BT. In these designs,\nthe antenna must be toggled between WLAN and BT.\n\nIn those hardware, managing WLAN co-existence with Bluetooth requires WLAN\nfull power save whenever there is Bluetooth activity in order for WLAN to be\nable to periodically relinquish the antenna to be used for BT. This is because\nBT can only access the shared antenna when WLAN is idle or asleep.\n\nSome hardware, for instance the wl1271, are able to indicate to the host\nwhenever there is BT traffic. In essence, the hardware will send an indication\nto the host whenever there is, for example, SCO traffic or A2DP traffic, and\nwill send another indication when the traffic is over.\n\nThe hardware gets information of Bluetooth traffic via hardware co-existence\ncontrol lines - these lines are used to negotiate the shared antenna\nownership. The hardware will give the antenna to BT whenever WLAN is sleeping.\n\nThis patch adds the interface to mac80211 to facilitate temporarily disabling\nof dynamic power save as per request of the WLAN driver. This interface will\nimmediately force WLAN to full powersave, hence allowing BT coexistence as\ndescribed above.\n\nIn these kind of shared antenna desings, when WLAN powersave is fully disabled,\nBluetooth will not work simultaneously with WLAN at all. This patch does not\naddress that problem. This interface will not change PSM state, so if PSM is\ndisabled it will remain so. Solving this problem requires knowledge about BT\nstate, and is best done in user-space.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2aa40aef9debc77d55cc87a50d335b6fe97fbeb0", "tree": "0dccf47cf6cb861c7efa72601fab9511760c7e74", "parents": [ "a7da1f55a826c621251874e7684c234972fc3216" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:40 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:06 2010 -0700" }, "message": "caif: Use link layer MTU instead of fixed MTU\n\nPreviously CAIF supported maximum transfer size of ~4050.\nThe transfer size is now calculated dynamically based on the\nlink layers mtu size.\n\nSigned-off-by: Sjur Braendeland@stericsson.com\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a7da1f55a826c621251874e7684c234972fc3216", "tree": "e5c66620b9cfe00ed62233665002a0acf5fc1004", "parents": [ "b1c74247b9e29ae3bfdf133862328c309bc9cf14" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:05 2010 -0700" }, "message": "caif: Bugfix - RFM must support segmentation.\n\nCAIF Remote File Manager may send or receive more than 4050 bytes.\nDue to this The CAIF RFM service have to support segmentation.\n\nSigned-off-by: Sjur Braendeland@stericsson.com\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b1c74247b9e29ae3bfdf133862328c309bc9cf14", "tree": "a20cd55d47036a22e3857d382ed505436a366efe", "parents": [ "c14c643b3d91cc741425c058968672228c310927" ], "author": { "name": "Sjur Braendeland", "email": "sjur.brandeland@stericsson.com", "time": "Thu Jun 17 06:55:38 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jun 20 19:46:05 2010 -0700" }, "message": "caif: Bugfix not all services uses flow-ctrl.\n\nFlow control is not used by all CAIF services.\nThe usage of flow control is now part of the gerneal\ninitialization function for CAIF Services.\n\nSigned-off-by: Sjur Braendeland@stericsson.com\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb9c03d8a6893517737b16fdbeb54be3c73b3023", "tree": "35fa0d1defaaf94641963a49126d7bb475ffa4c6", "parents": [ "4de57826810fd2cfeb2ab5c7d003ff9116b8f7ee", "abf52f86aa0a49a7377350cafa8f218c4cd227e7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 17 14:19:06 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 17 14:19:06 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n" }, { "commit": "c68cd6cc21eb329c47ff020ff7412bf58176984e", "tree": "2e49be79c66d550b37fc494e22b5e31b39a8bc38", "parents": [ "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 17 06:12:26 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Thu Jun 17 06:12:26 2010 +0200" }, "message": "netfilter: nf_nat: support user-specified SNAT rules in LOCAL_IN\n\n2.6.34 introduced \u0027conntrack zones\u0027 to deal with cases where packets\nfrom multiple identical networks are handled by conntrack/NAT. Packets\nare looped through veth devices, during which they are NATed to private\naddresses, after which they can continue normally through the stack\nand possibly have NAT rules applied a second time.\n\nThis works well, but is needlessly complicated for cases where only\na single SNAT/DNAT mapping needs to be applied to these packets. In that\ncase, all that needs to be done is to assign each network to a seperate\nzone and perform NAT as usual. However this doesn\u0027t work for packets\ndestined for the machine performing NAT itself since its corrently not\npossible to configure SNAT mappings for the LOCAL_IN chain.\n\nThis patch adds a new INPUT chain to the NAT table and changes the\ntargets performing SNAT to be usable in that chain.\n\nExample usage with two identical networks (192.168.0.0/24) on eth0/eth1:\n\niptables -t raw -A PREROUTING -i eth0 -j CT --zone 1\niptables -t raw -A PREROUTING -i eth0 -j MARK --set-mark 1\niptables -t raw -A PREROUTING -i eth1 -j CT --zone 2\niptabels -t raw -A PREROUTING -i eth1 -j MARK --set-mark 2\n\niptables -t nat -A INPUT -m mark --mark 1 -j NETMAP --to 10.0.0.0/24\niptables -t nat -A POSTROUTING -m mark --mark 1 -j NETMAP --to 10.0.0.0/24\niptables -t nat -A INPUT -m mark --mark 2 -j NETMAP --to 10.0.1.0/24\niptables -t nat -A POSTROUTING -m mark --mark 2 -j NETMAP --to 10.0.1.0/24\n\niptables -t raw -A PREROUTING -d 10.0.0.0/24 -j CT --zone 1\niptables -t raw -A OUTPUT -d 10.0.0.0/24 -j CT --zone 1\niptables -t raw -A PREROUTING -d 10.0.1.0/24 -j CT --zone 2\niptables -t raw -A OUTPUT -d 10.0.1.0/24 -j CT --zone 2\n\niptables -t nat -A PREROUTING -d 10.0.0.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A OUTPUT -d 10.0.0.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A PREROUTING -d 10.0.1.0/24 -j NETMAP --to 192.168.0.0/24\niptables -t nat -A OUTPUT -d 10.0.1.0/24 -j NETMAP --to 192.168.0.0/24\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" }, { "commit": "7361c36c5224519b258219fe3d0e8abc865d8134", "tree": "7987367633b4729dff0afa2180862a2ce919f3cb", "parents": [ "257b5358b32f17e0603b6ff57b13610b0e02348f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:34:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:58:16 2010 -0700" }, "message": "af_unix: Allow credentials to work across user and pid namespaces.\n\nIn unix_skb_parms store pointers to struct pid and struct cred instead\nof raw uid, gid, and pid values, then translate the credentials on\nreception into values that are meaningful in the receiving processes\nnamespaces.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "257b5358b32f17e0603b6ff57b13610b0e02348f", "tree": "15c4887d45eb6ccfe32f5e67b5c0009e1e8dae6c", "parents": [ "b47030c71dfd6c8cd5cb6e551b6f7f7cfc96f6a6" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:32:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:56 2010 -0700" }, "message": "scm: Capture the full credentials of the scm sender.\n\nStart capturing not only the userspace pid, uid and gid values of the\nsending process but also the struct pid and struct cred of the sending\nprocess as well.\n\nThis is in preparation for properly supporting SCM_CREDENTIALS for\nsockets that have different uid and/or pid namespaces at the different\nends.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Serge E. Hallyn \u003cserge@hallyn.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "109f6e39fa07c48f580125f531f46cb7c245b528", "tree": "9ec97679c227394a44ebede5768f92d970cea6eb", "parents": [ "3f551f9436c05a3b5eccdd6e94733df5bb98d2a5" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:30:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:55 2010 -0700" }, "message": "af_unix: Allow SO_PEERCRED to work across namespaces.\n\nUse struct pid and struct cred to store the peer credentials on struct\nsock. This gives enough information to convert the peer credential\ninformation to a value relative to whatever namespace the socket is in\nat the time.\n\nThis removes nasty surprises when using SO_PEERCRED on socket\nconnetions where the processes on either side are in different pid and\nuser namespaces.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Daniel Lezcano \u003cdaniel.lezcano@free.fr\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "812e876e842488221aa54cb4587a8a33445cfa9e", "tree": "cb8475918fc3c9a9cf624e643bb679af34e0c24e", "parents": [ "434d7b380f2bfc2161b9aaee2cada177a4a4261f" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Jun 13 03:27:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:55:34 2010 -0700" }, "message": "scm: Reorder scm_cookie.\n\nReorder the fields in scm_cookie so they pack better on 64bit.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@openvz.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8c76368174ed2359739f1b7b8a9c042b1ef839c4", "tree": "143aa28c9438b24154bc3d1e36b432a534eca50c", "parents": [ "317fe0e6c5dc9448bcef41a2e31fecfd3dba7f55" ], "author": { "name": "Florian Westphal", "email": "fw@strlen.de", "time": "Wed Jun 16 14:42:15 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 14:42:15 2010 -0700" }, "message": "syncookies: check decoded options against sysctl settings\n\nDiscard the ACK if we find options that do not match current sysctl\nsettings.\n\nPreviously it was possible to create a connection with sack, wscale,\netc. enabled even if the feature was disabled via sysctl.\n\nAlso remove an unneeded call to tcp_sack_reset() in\ncookie_check_timestamp: Both call sites (cookie_v4_check,\ncookie_v6_check) zero \"struct tcp_options_received\", hand it to\ntcp_parse_options() (which does not change tcp_opt-\u003enum_sacks/dsack)\nand then call cookie_check_timestamp().\n\nEven if num_sacks/dsacks were changed, the structure is allocated on\nthe stack and after cookie_check_timestamp returns only a few selected\nmembers are copied to the inet_request_sock.\n\nSigned-off-by: Florian Westphal \u003cfw@strlen.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "317fe0e6c5dc9448bcef41a2e31fecfd3dba7f55", "tree": "c2a042e1c8bb96b7fdeadf658309ead1b6e8dabc", "parents": [ "fdb93f8ac39aa5902f3d264edd50dffcabfdd13b" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Jun 16 04:52:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 16 11:55:39 2010 -0700" }, "message": "inetpeer: restore small inet_peer structures\n\nAddition of rcu_head to struct inet_peer added 16bytes on 64bit arches.\n\nThats a bit unfortunate, since old size was exactly 64 bytes.\n\nThis can be solved, using an union between this rcu_head an four fields,\nthat are normally used only when a refcount is taken on inet_peer.\nrcu_head is used only when refcnt\u003d-1, right before structure freeing.\n\nAdd a inet_peer_refcheck() function to check this assertion for a while.\n\nWe can bring back SLAB_HWCACHE_ALIGN qualifier in kmem cache creation.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa1039e73cc2cf834e99c09d2033d5d2675357b9", "tree": "0db06e4adddaf0f77b4e8de170710b74a17375e4", "parents": [ "7b34a4644b4342896e0c1967b8f953213ea4a990" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Jun 15 08:23:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 14:23:38 2010 -0700" }, "message": "inetpeer: RCU conversion\n\ninetpeer currently uses an AVL tree protected by an rwlock.\n\nIt\u0027s possible to make most lookups use RCU\n\n1) Add a struct rcu_head to struct inet_peer\n\n2) add a lookup_rcu_bh() helper to perform lockless and opportunistic\nlookup. This is a normal function, not a macro like lookup().\n\n3) Add a limit to number of links followed by lookup_rcu_bh(). This is\nneeded in case we fall in a loop.\n\n4) add an smp_wmb() in link_to_pool() right before node insert.\n\n5) make unlink_from_pool() use atomic_cmpxchg() to make sure it can take\nlast reference to an inet_peer, since lockless readers could increase\nrefcount, even while we hold peers.lock.\n\n6) Delay struct inet_peer freeing after rcu grace period so that\nlookup_rcu_bh() cannot crash.\n\n7) inet_getpeer() first attempts lockless lookup.\n Note this lookup can fail even if target is in AVL tree, but a\nconcurrent writer can let tree in a non correct form.\n If this attemps fails, lock is taken a regular lookup is performed\nagain.\n\n8) convert peers.lock from rwlock to a spinlock\n\n9) Remove SLAB_HWCACHE_ALIGN when peer_cachep is created, because\nrcu_head adds 16 bytes on 64bit arches, doubling effective size (64 -\u003e\n128 bytes)\nIn a future patch, this is probably possible to revert this part, if rcu\nfield is put in an union to share space with rid, ip_id_count, tcp_ts \u0026\ntcp_ts_stamp. These fields being manipulated only with refcnt \u003e 0.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "16fb62b6b4d57339a0ec931b3fb8c8d0ca6414e8", "tree": "a1041342f31a626baf3a08d09d5c81a65dd8ef28", "parents": [ "a3433f35a55f7604742cae620c6dc6edfc70db6a", "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 13:49:24 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 13:49:24 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6\n" }, { "commit": "ff61638105db6f5832ef8700436ba6aa6d3a2fda", "tree": "ff55ef6186cd46d87ca4e54efbbe82f5ecc68f1e", "parents": [ "685429623f88d84f98bd5daffc3c427c408740d4" ], "author": { "name": "Juuso Oikarinen", "email": "juuso.oikarinen@nokia.com", "time": "Wed Jun 09 09:51:52 2010 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue Jun 15 16:00:48 2010 -0400" }, "message": "mac80211: Fix ps-qos network latency handling\n\nThe ps-qos latency handling is broken. It uses predetermined latency values\nto select specific dynamic PS timeouts. With common AP configurations, these\nvalues overlap with beacon interval and are therefore essentially useless\n(for network latencies less than the beacon interval, PSM is disabled.)\n\nThis patch remedies the problem by replacing the predetermined network latency\nvalues with one high value (1900ms) which is used to go trigger full psm. For\nbackwards compatibility, the value 2000ms is still mapped to a dynamic ps\ntimeout of 100ms.\n\nCurrently also the mac80211 internal value for storing user space configured\ndynamic PSM values is incorrectly in the driver visible ieee80211_conf struct.\nMove it to the ieee80211_local struct.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a3433f35a55f7604742cae620c6dc6edfc70db6a", "tree": "4ce6d169e402c03a48319a9db4055cc31df00d42", "parents": [ "f350a0a87374418635689471606454abc7beaa3a" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Sat Jun 12 14:01:43 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 15 11:56:19 2010 -0700" }, "message": "tcp: unify tcp flag macros\n\nunify tcp flag macros: TCPHDR_FIN, TCPHDR_SYN, TCPHDR_RST, TCPHDR_PSH,\nTCPHDR_ACK, TCPHDR_URG, TCPHDR_ECE and TCPHDR_CWR. TCBCB_FLAG_* are replaced\nwith the corresponding TCPHDR_*.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\n----\n include/net/tcp.h | 24 ++++++-------\n net/ipv4/tcp.c | 8 ++--\n net/ipv4/tcp_input.c | 2 -\n net/ipv4/tcp_output.c | 59 ++++++++++++++++-----------------\n net/netfilter/nf_conntrack_proto_tcp.c | 32 ++++++-----------\n net/netfilter/xt_TCPMSS.c | 4 --\n 6 files changed, 58 insertions(+), 71 deletions(-)\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f9181f4ffc71d7b7dd1906c9a11d51d6659220ae", "tree": "194f22e8216a1b9ee2c0dd019142202d73a7dc87", "parents": [ "0902b469bd25065aa0688c3cee6f11744c817e7c", "1ab6c163dee279559e3a62d774af7e4c4c9b4c67" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "committer": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Tue Jun 15 17:31:06 2010 +0200" }, "message": "Merge branch \u0027master\u0027 of /repos/git/net-next-2.6\n\nConflicts:\n\tinclude/net/netfilter/xt_rateest.h\n\tnet/bridge/br_netfilter.c\n\tnet/netfilter/nf_conntrack_core.c\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\n" } ], "next": "685429623f88d84f98bd5daffc3c427c408740d4" }