)]}' { "log": [ { "commit": "2721745501a26d0dc3b88c0d2f3aa11471891388", "tree": "e9c09622b11ad7d9317b4b01824374a852867c28", "parents": [ "761965eab38d2cbc59c36e355c59609e3a04705a" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 16:52:08 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 05 15:20:19 2011 -0500" }, "message": "net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.\n\nTo reflect the fact that a refrence is not obtained to the\nresulting neighbour entry.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "340e8dc1fb4032b6c8334c9bff20b2aec42ecfd8", "tree": "0447574f6879782f7fe8f093b0a2f7e86f40d6b7", "parents": [ "b3613118eb30a589d971e4eccbbb2a1314f5dfd4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 14:27:11 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 02 14:27:11 2011 -0500" }, "message": "atm: clip: Remove code commented out since eternity.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "32092ecf0644e91070f9eff4f6e1edda8f90aecc", "tree": "3e2e2a111364f08653b79fd7404346e9f4b5ee84", "parents": [ "da6a8fa0275e2178c44a875374cae80d057538d1" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:51:03 2011 -0500" }, "message": "atm: clip: Use device neigh support on top of \"arp_tbl\".\n\nInstead of instantiating an entire new neigh_table instance\njust for ATM handling, use the neigh device private facility.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "869759b9e4160fb8a8d25bc3b4ce3b658523aebb", "tree": "73c7c66ee11e4426c582502be33ba0907225bf91", "parents": [ "76cc714ed5fe6ed90aad5c52ff3030f1f4e22a48" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:33 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:46:44 2011 -0500" }, "message": "atm: clip: Convert over to neighbour_priv()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "76cc714ed5fe6ed90aad5c52ff3030f1f4e22a48", "tree": "400ab85cded60f5792ff9d4a32d12d4035ee03ff", "parents": [ "596b9b68ef118f7409afbc78487263e08ef96261" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:28 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:46:43 2011 -0500" }, "message": "neigh: Do not set tbl-\u003eentry_size in ipv4/ipv6 neigh tables.\n\nLet the core self-size the neigh entry based upon the key length.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "596b9b68ef118f7409afbc78487263e08ef96261", "tree": "0def3e591a0d5ede89e85339e35da3072f09330c", "parents": [ "5b8b0060cbd6332ae5d1fa0bec0e8e211248d0e7" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Mon Jul 25 00:01:25 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 30 18:46:43 2011 -0500" }, "message": "neigh: Add infrastructure for allocating device neigh privates.\n\nnetdev-\u003eneigh_priv_len records the private area length.\n\nThis will trigger for neigh_table objects which set tbl-\u003eentry_size\nto zero, and the first instances of this will be forthcoming.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "befc93fe76177b3b6ee1e3351b58293866f43aa6", "tree": "628719a9883321ada7fde842141a739565c51f5b", "parents": [ "9e667b29880df842085150d60e26c60f141fff44" ], "author": { "name": "Pascal Hambourg", "email": "pascal@plouf.fr.eu.org", "time": "Wed Aug 17 08:37:52 2011 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 00:28:06 2011 -0500" }, "message": "atm: br2684: Avoid alignment issues\n\nUse memcmp() instead of cast to u16 when checking the PAD field.\n\nSigned-off-by: Pascal Hambourg \u003cpascal@plouf.fr.eu.org\u003e\nSigned-off-by: chas williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e667b29880df842085150d60e26c60f141fff44", "tree": "ec49d63db929de2fc502107d4d5346ad6435dd32", "parents": [ "08e29af3a9096ffdff477e537daea67faefd3952" ], "author": { "name": "Pascal Hambourg", "email": "pascal@plouf.fr.eu.org", "time": "Wed Aug 17 08:37:18 2011 +0200" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 29 00:28:06 2011 -0500" }, "message": "atm: br2684: Make headroom and hard_header_len depend on the payload type\n\nRouted payload requires less headroom than bridged payload.\nSo do not reallocate headroom if not needed.\nAlso, add worst case AAL5 overhead to netdev-\u003ehard_header_len.\n\nSigned-off-by: Pascal Hambourg \u003cpascal@plouf.fr.eu.org\u003e\nSigned-off-by: chas williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "49f5ed4250c757cb19d953fcac2737a35ca14d76", "tree": "065c6a559b1b8b0a81f62f100804694a05659484", "parents": [ "021ac8d387594bdf51d9a279b2f9e9defb614c9b" ], "author": { "name": "chas williams - CONTRACTOR", "email": "chas@cmf.nrl.navy.mil", "time": "Tue Nov 22 12:51:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Nov 26 16:40:30 2011 -0500" }, "message": "atm: eliminate atm_guess_pdu2truesize()\n\nSigned-off-by: Chas Williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "40ba84993d66469d336099c5af74c3da5b73e28d", "tree": "3935df24cbdc9faab02e42342d24b48f5b0c0b11", "parents": [ "4e55f5785825f18b1eb6c5cc5a9717e276925805" ], "author": { "name": "Jorge Boncompte [DTI2]", "email": "jorge@dti2.net", "time": "Mon Nov 21 10:25:58 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:15:49 2011 -0500" }, "message": "atm: Allow MSG_PEEK for atm sockets\n\nNow that the vcc backends do the right thing with respect the receive\nqueue on registration, allow MSK_PEEK for atm sockets.\n\nThis allows a userspace program to inspect the packets and decide what\nbackend to use to handle them.\n\nSigned-off-by: Jorge Boncompte [DTI2] \u003cjorge@dti2.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e55f5785825f18b1eb6c5cc5a9717e276925805", "tree": "31a7c44400e598e82e1de0a7326952d00b28767d", "parents": [ "3b829366cc6d0adeb4df2c2d917926f6b41c573d" ], "author": { "name": "Jorge Boncompte [DTI2]", "email": "jorge@dti2.net", "time": "Mon Nov 21 10:25:57 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:15:42 2011 -0500" }, "message": "atm: Introduce vcc_process_recv_queue\n\nThis function moves the implementation found in the clip and br2684\nmodules to common code, correctly unlinks the skb from the queue\nbefore pushing it and makes pppoatm use it.\n\nSigned-off-by: Jorge Boncompte [DTI2] \u003cjorge@dti2.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3b829366cc6d0adeb4df2c2d917926f6b41c573d", "tree": "be99f35ab02c024fbb777644a0582ce25f35fc93", "parents": [ "ada22aa563c5932242d9684e01a3f51b7ea08801" ], "author": { "name": "Jorge Boncompte [DTI2]", "email": "jorge@dti2.net", "time": "Mon Nov 21 10:25:56 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:15:34 2011 -0500" }, "message": "atm: clip: move clip_devs check to clip_push\n\nThis will allow further cleanup.\n\nSigned-off-by: Jorge Boncompte [DTI2] \u003cjorge@dti2.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ada22aa563c5932242d9684e01a3f51b7ea08801", "tree": "4a2f37b0dfd72dfc219ae075b079bf3a1db9d2ba", "parents": [ "fe685b80469996149ca28c74062f72b5879c1607" ], "author": { "name": "Jorge Boncompte [DTI2]", "email": "jorge@dti2.net", "time": "Mon Nov 21 10:25:55 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:15:28 2011 -0500" }, "message": "atm: clip: Don\u0027t move counters backwards\n\nI don\u0027t see the point on substracting the skb len from the netdev\nstats.\n\nSigned-off-by: Jorge Boncompte [DTI2] \u003cjorge@dti2.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fe685b80469996149ca28c74062f72b5879c1607", "tree": "7885ea4abcda7a2cc64274a51a72ba61e2c81487", "parents": [ "e348c5e7de4a759a94eed4d0303ba81a4939f8b9" ], "author": { "name": "Jorge Boncompte [DTI2]", "email": "jorge@dti2.net", "time": "Mon Nov 21 10:25:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Nov 22 16:15:22 2011 -0500" }, "message": "atm: br2684: Do not move counters backwards\n\nThis snippet has caused several bugs in the past, and I don\u0027t see the\npoint on substracting the skb len from netdev stats.\n\nSigned-off-by: Jorge Boncompte [DTI2] \u003cjorge@dti2.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b5c171bb3dc0686b2647a84e990199c5faa9ef8", "tree": "ad1298a6ba5d541638f2f4b1d26d0dad576b9189", "parents": [ "292d1398983f3514a0eab13b7606df7f4730b498" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Nov 09 12:07:14 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Nov 14 00:47:54 2011 -0500" }, "message": "neigh: new unresolved queue limits\n\nLe mercredi 09 novembre 2011 à 16:21 -0500, David Miller a écrit :\n\u003e From: David Miller \u003cdavem@davemloft.net\u003e\n\u003e Date: Wed, 09 Nov 2011 16:16:44 -0500 (EST)\n\u003e\n\u003e \u003e From: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\n\u003e \u003e Date: Wed, 09 Nov 2011 12:14:09 +0100\n\u003e \u003e\n\u003e \u003e\u003e unres_qlen is the number of frames we are able to queue per unresolved\n\u003e \u003e\u003e neighbour. Its default value (3) was never changed and is responsible\n\u003e \u003e\u003e for strange drops, especially if IP fragments are used, or multiple\n\u003e \u003e\u003e sessions start in parallel. Even a single tcp flow can hit this limit.\n\u003e \u003e ...\n\u003e \u003e\n\u003e \u003e Ok, I\u0027ve applied this, let\u0027s see what happens :-)\n\u003e\n\u003e Early answer, build fails.\n\u003e\n\u003e Please test build this patch with DECNET enabled and resubmit. The\n\u003e decnet neigh layer still refers to the removed -\u003equeue_len member.\n\u003e\n\u003e Thanks.\n\nOuch, this was fixed on one machine yesterday, but not the other one I\nused this morning, sorry.\n\n[PATCH V5 net-next] neigh: new unresolved queue limits\n\nunres_qlen is the number of frames we are able to queue per unresolved\nneighbour. Its default value (3) was never changed and is responsible\nfor strange drops, especially if IP fragments are used, or multiple\nsessions start in parallel. Even a single tcp flow can hit this limit.\n\n$ arp -d 192.168.20.108 ; ping -c 2 -s 8000 192.168.20.108\nPING 192.168.20.108 (192.168.20.108) 8000(8028) bytes of data.\n8008 bytes from 192.168.20.108: icmp_seq\u003d2 ttl\u003d64 time\u003d0.322 ms\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc3b2d7fb9b014d75ebb79ba371a763dbab5e8cf", "tree": "b0fd4e724bdb1c0a1783616614ae5a9dec1cfa5c", "parents": [ "d9b9384215e17c68d7b6bd05d6fa409e5d4140d7" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Fri Jul 15 11:47:34 2011 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Oct 31 19:30:30 2011 -0400" }, "message": "net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules\n\nThese files are non modular, but need to export symbols using\nthe macros now living in export.h -- call out the include so\nthat things won\u0027t break when we remove the implicit presence\nof module.h from everywhere.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "8decf868790b48a727d7e7ca164f2bcd3c1389c0", "tree": "b759a5f861f842af7ea76f9011b579d06e9d5508", "parents": [ "3fc72370186be2f9d4d6ef06d99e1caa5d92c564", "d93dc5c4478c1fd5de85a3e8aece9aad7bbae044" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Sep 22 03:23:13 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of github.com:davem330/net\n\nConflicts:\n\tMAINTAINERS\n\tdrivers/net/Kconfig\n\tdrivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c\n\tdrivers/net/ethernet/broadcom/tg3.c\n\tdrivers/net/wireless/iwlwifi/iwl-pci.c\n\tdrivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c\n\tdrivers/net/wireless/rt2x00/rt2800usb.c\n\tdrivers/net/wireless/wl12xx/main.c\n" }, { "commit": "fbe5e29ec1886967255e76946aaf537b8cc9b81e", "tree": "29256fddc5970305e8f70b1df36a208deede83dd", "parents": [ "98e77438aed3cd3343cbb86825127b1d9d2bea33" ], "author": { "name": "Daniel Schwierzeck", "email": "daniel.schwierzeck@googlemail.com", "time": "Fri Aug 19 12:04:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Aug 20 14:13:05 2011 -0700" }, "message": "atm: br2684: Fix oops due to skb-\u003edev being NULL\n\nThis oops have been already fixed with commit\n\n 27141666b69f535a4d63d7bc6d9e84ee5032f82a\n\n atm: [br2684] Fix oops due to skb-\u003edev being NULL\n\n It happens that if a packet arrives in a VC between the call to open it on\n the hardware and the call to change the backend to br2684, br2684_regvcc\n processes the packet and oopses dereferencing skb-\u003edev because it is\n NULL before the call to br2684_push().\n\nbut have been introduced again with commit\n\n b6211ae7f2e56837c6a4849316396d1535606e90\n\n atm: Use SKB queue and list helpers instead of doing it by-hand.\n\nSigned-off-by: Daniel Schwierzeck \u003cdaniel.schwierzeck@googlemail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "afc4b13df143122f99a0eb10bfefb216c2806de0", "tree": "5a90e0a8226ce4173d8d366f5bed0322c9623cdd", "parents": [ "01789349ee52e4a3faf376f1485303d9723c4f1f" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Tue Aug 16 06:29:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 17 20:22:03 2011 -0700" }, "message": "net: remove use of ndo_set_multicast_list in drivers\n\nreplace it by ndo_set_rx_mode\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a08af810cdc29d2ca930e8a869d3d01744c392d8", "tree": "6271e1bdb3d9d54ccb612ddbfdc1b2d252fbbb13", "parents": [ "e1738bd9cecc5c867b0e2996470c1ff20f66ba79" ], "author": { "name": "Chas Williams", "email": "chas@cmf.nrl.navy.mil", "time": "Mon Aug 01 17:56:14 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 01 17:56:14 2011 -0700" }, "message": "atm: br2864: sent packets truncated in VC routed mode\n\nReported-by: Pascal Hambourg \u003cpascal@plouf.fr.eu.org\u003e\nSigned-off-by: Chas Williams \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "60063497a95e716c9a689af3be2687d261f115b4", "tree": "6ce0d68db76982c53df46aee5f29f944ebf2c320", "parents": [ "148817ba092f9f6edd35bad3c6c6b8e8f90fe2ed" ], "author": { "name": "Arun Sharma", "email": "asharma@fb.com", "time": "Tue Jul 26 16:09:06 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 26 16:49:47 2011 -0700" }, "message": "atomic: use \u003clinux/atomic.h\u003e\n\nThis allows us to move duplicated code in \u003casm/atomic.h\u003e\n(atomic_inc_not_zero() for now) to \u003clinux/atomic.h\u003e\n\nSigned-off-by: Arun Sharma \u003casharma@fb.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "69cce1d1404968f78b177a0314f5822d5afdbbfb", "tree": "26223264fd69ea8078d0013fd5a76eb7aeb04c12", "parents": [ "9cbb7ecbcff85077bb12301aaf4c9b5a56c5993d" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 23:09:49 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 23:11:35 2011 -0700" }, "message": "net: Abstract dst-\u003eneighbour accesses behind helpers.\n\ndst_{get,set}_neighbour()\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8f40b161de4f27402b4c0659ad2ae83fad5a0cdd", "tree": "9e2dbd4ba8a66916c690b0e5791ac25ea0958c26", "parents": [ "69ecca86da4890c13a5e29c51b4ac76a1a8a62c9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 13:34:11 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 17 23:11:17 2011 -0700" }, "message": "neigh: Pass neighbour entry to output ops.\n\nThis will get us closer to being able to do \"neigh stuff\"\ncompletely independent of the underlying dst_entry for\nprotocols (ipv4/ipv6) that wish to do so.\n\nWe will also be able to make dst entries neigh-less.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "542d4d685febf3110d1a08d0bcb9f6ef060b76f7", "tree": "8bfb9b8c8f7e8d359030781367634269f843d3e3", "parents": [ "b23b5455b6458920179a1f27513ce42e70d11f37" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 16 18:06:24 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 16 18:30:59 2011 -0700" }, "message": "neigh: Kill ndisc_ops-\u003equeue_xmit\n\nIt is always dev_queue_xmit().\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "47ec132a40d788d45e2f088545dea68798034dab", "tree": "f3089b58b4ef12cca150bdd4bf213d8a627a0035", "parents": [ "0895b08adeb3f660cdff21990d0a9c2b59a919e7" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 16 17:39:57 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jul 16 17:39:57 2011 -0700" }, "message": "neigh: Kill neigh_ops-\u003ehh_output\n\nIt\u0027s always dev_queue_xmit().\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ea110733874d5176cb56dcf612a629ffac09dbf0", "tree": "d079bb9990ecf7dadc326b62605fb4de1f6fad4f", "parents": [ "3c8def9776c3d4636291432522ea312f7a44be95" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jun 13 16:21:26 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@conan.davemloft.net", "time": "Thu Jun 16 23:19:27 2011 -0400" }, "message": "net: Remove casts of void *\n\nUnnecessary casts of void * clutter the code.\n\nThese are the remainder casts after several specific\npatches to remove netdev_priv and dev_priv.\n\nDone via coccinelle script:\n\n$ cat cast_void_pointer.cocci\n@@\ntype T;\nT *pt;\nvoid *pv;\n@@\n\n- pt \u003d (T *)pv;\n+ pt \u003d pv;\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Paul Moore \u003cpaul.moore@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@conan.davemloft.net\u003e\n" }, { "commit": "a6b7a407865aab9f849dd99a71072b7cd1175116", "tree": "42995f2e25b777e8930b5ac180599f8d4e655df6", "parents": [ "aedfebbaa7a4883dc568d8d32b7b32a0f9833f41" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Mon Jun 06 10:43:46 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jun 06 22:55:11 2011 -0700" }, "message": "net: remove interrupt.h inclusion from netdevice.h\n\n* remove interrupt.g inclusion from netdevice.h -- not needed\n* fixup fallout, add interrupt.h and hardirq.h back where needed.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "10799db60cbc4f990dd69eb49883477095c66af7", "tree": "b87ac6acaa48f4f59f5d6a0b11490105876952e1", "parents": [ "aaab184276a6e20834f63735d433f94ef52a0497", "c5c177b4aca83338781e72be2e6dd1601c560cb3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 11:16:27 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 11:16:27 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n net: Kill ratelimit.h dependency in linux/net.h\n net: Add linux/sysctl.h includes where needed.\n net: Kill ether_table[] declaration.\n inetpeer: fix race in unused_list manipulations\n atm: expose ATM device index in sysfs\n IPVS: bug in ip_vs_ftp, same list heaad used in all netns.\n bug.h: Move ratelimit warn interfaces to ratelimit.h\n bonding: cleanup module option descriptions\n net:8021q:vlan.c Fix pr_info to just give the vlan fullname and version.\n net: davinci_emac: fix dev_err use at probe\n can: convert to %pK for kptr_restrict support\n net: fix ETHTOOL_SFEATURES compatibility with old ethtool_ops.set_flags\n netfilter: Fix several warnings in compat_mtw_from_user().\n netfilter: ipset: fix ip_set_flush return code\n netfilter: ipset: remove unused variable from type_pf_tdel()\n netfilter: ipset: Use proper timeout value to jiffies conversion\n" }, { "commit": "e7a46b4d0839c2a3aa2e0ae0b145f293f6738498", "tree": "ce38143b070fb4f5ed96e93bd5a8e3324016653e", "parents": [ "58bf2dbccc5aca12df77e2328f478e239a68bdd5" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Fri May 27 04:51:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri May 27 13:07:21 2011 -0400" }, "message": "atm: expose ATM device index in sysfs\n\nIt\u0027s currently exposed only through /proc which, besides requiring\nscreen-scraping, doesn\u0027t allow userspace to distinguish between two\nidentical ATM adapters with different ATM indexes. The ATM device index\nis required when using PPPoATM on a system with multiple ATM adapters.\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nReviewed-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nTested-by: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7c2f036284452627d793af981877817b37d4351", "tree": "c96bbf7558512b27f4802994c9271ccd0f1c19f3", "parents": [ "14587a2a25447813996e6fb9e48d48627cb75a5d", "8d2c50e3b65c8d48d51088f541c13fde46cc8133" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 13:19:00 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 26 13:19:00 2011 -0700" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:\n gfs2: Drop __TIME__ usage\n isdn/diva: Drop __TIME__ usage\n atm: Drop __TIME__ usage\n dlm: Drop __TIME__ usage\n wan/pc300: Drop __TIME__ usage\n parport: Drop __TIME__ usage\n hdlcdrv: Drop __TIME__ usage\n baycom: Drop __TIME__ usage\n pmcraid: Drop __DATE__ usage\n edac: Drop __DATE__ usage\n rio: Drop __DATE__ usage\n scsi/wd33c93: Drop __TIME__ usage\n scsi/in2000: Drop __TIME__ usage\n aacraid: Drop __TIME__ usage\n media/cx231xx: Drop __TIME__ usage\n media/radio-maxiradio: Drop __TIME__ usage\n nozomi: Drop __TIME__ usage\n cyclades: Drop __TIME__ usage\n" }, { "commit": "36a9f77e50032e367b43d72866c18f4a61cf89da", "tree": "bbd8243b9a80b2c557dd41630cac62fcebdee4a2", "parents": [ "75ce481e15911b4557da1250556eab5ffbd14d0d" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Fri Apr 01 12:41:20 2011 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Thu May 26 09:46:47 2011 +0200" }, "message": "atm: Drop __TIME__ usage\n\nThe kernel already prints its build timestamp during boot, no need to\nrepeat it in random drivers and produce different object files each\ntime.\n\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: netdev@vger.kernel.org\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "71338aa7d050c86d8765cd36e46be514fb0ebbce", "tree": "96bacb805b939c490145b31b4e2fb9e5cea79c5d", "parents": [ "229de618ba6ff36e382b908b7637fe56c25ae9f1" ], "author": { "name": "Dan Rosenberg", "email": "drosenberg@vsecurity.com", "time": "Mon May 23 12:17:35 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 24 01:13:12 2011 -0400" }, "message": "net: convert %p usage to %pK\n\nThe %pK format specifier is designed to hide exposed kernel pointers,\nspecifically via /proc interfaces. Exposing these pointers provides an\neasy target for kernel write vulnerabilities, since they reveal the\nlocations of writable structures containing easily triggerable function\npointers. The behavior of %pK depends on the kptr_restrict sysctl.\n\nIf kptr_restrict is set to 0, no deviation from the standard %p behavior\noccurs. If kptr_restrict is set to 1, the default, if the current user\n(intended to be a reader via seq_printf(), etc.) does not have CAP_SYSLOG\n(currently in the LSM tree), kernel pointers using %pK are printed as 0\u0027s.\n If kptr_restrict is set to 2, kernel pointers using %pK are printed as\n0\u0027s regardless of privileges. Replacing with 0\u0027s was chosen over the\ndefault \"(null)\", which cannot be parsed by userland %p, which expects\n\"(nil)\".\n\nThe supporting code for kptr_restrict and %pK are currently in the -mm\ntree. This patch converts users of %p in net/ to %pK. Cases of printing\npointers to the syslog are not covered, since this would eliminate useful\ninformation for postmortem debugging and the reading of the syslog is\nalready optionally protected by the dmesg_restrict sysctl.\n\nSigned-off-by: Dan Rosenberg \u003cdrosenberg@vsecurity.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: Thomas Graf \u003ctgraf@infradead.org\u003e\nCc: Eugene Teo \u003ceugeneteo@kernel.org\u003e\nCc: Kees Cook \u003ckees.cook@canonical.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Eric Paris \u003ceparis@parisplace.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e5ebaf852b96aaf4d7f63b920d8016b6784f088", "tree": "900f42081925c90a1a2d29a48aa4cef724b59b97", "parents": [ "d8f969e603b85931f25a1d50f3a7a01e2712c17a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 17 00:48:01 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 17 00:48:36 2011 -0700" }, "message": "atm: lec: Fix set-but-unused variables.\n\nThe variable \u0027eth\u0027 is set but unused in lec_handle_bridge(). Also,\nthe variable \u0027priv\u0027 is set but unused in lane_module_cleanup().\n\nJust kill them off.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "c031235b395433350f25943b7580a5e343c7b7b2", "tree": "2b00c05104439e9a8bbf6d521b649f2138945b80", "parents": [ "18b429e74eeafe42e947b1b0f9a760c7153a0b5c" ], "author": { "name": "Philip A. Prindeville", "email": "philipp@redfish-solutions.com", "time": "Wed Mar 30 13:17:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 30 16:53:38 2011 -0700" }, "message": "atm/solos-pci: Don\u0027t flap VCs when carrier state changes\n\nDon\u0027t flap VCs when carrier state changes; higher-level protocols\ncan detect loss of connectivity and act accordingly. This is more\nconsistent with how other network interfaces work.\n\nWe no longer use release_vccs() so we can delete it.\n\nrelease_vccs() was duplicated from net/atm/common.c; make the\ncorresponding function exported, since other code duplicates it\nand could leverage it if it were public.\n\nSigned-off-by: Philip A. Prindeville \u003cphilipp@redfish-solutions.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "78fbfd8a653ca972afe479517a40661bfff6d8c3", "tree": "9dccc5c16bf269d53d8499064ec95a998e84c646", "parents": [ "1561747ddf9d28185548687b11aae7074d6129c4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 00:00:52 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 12 15:08:42 2011 -0800" }, "message": "ipv4: Create and use route lookup helpers.\n\nThe idea here is this minimizes the number of places one has to edit\nin order to make changes to how flows are defined and used.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b23dd4fe42b455af5c6e20966b7d6959fa8352ea", "tree": "bf97323eae9a8d084170e573ff2c0c40bc72c3cd", "parents": [ "452edd598f60522c11f7f88fdbab27eb36509d1a" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 14:31:35 2011 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Mar 02 14:31:35 2011 -0800" }, "message": "ipv4: Make output route lookup return rtable directly.\n\nInstead of on the stack.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "23d69b09b78c4876e134f104a3814c30747c53f1", "tree": "40744de4f4126c21027ce537264524095e0e7979", "parents": [ "e744070fd4ff9d3114277e52d77afa21579adce2", "569ff2de2e1c8ac67c8df3a7367d46d0d9460a35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 16:58:04 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq\n\n* \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)\n usb: don\u0027t use flush_scheduled_work()\n speedtch: don\u0027t abuse struct delayed_work\n media/video: don\u0027t use flush_scheduled_work()\n media/video: explicitly flush request_module work\n ioc4: use static work_struct for ioc4_load_modules()\n init: don\u0027t call flush_scheduled_work() from do_initcalls()\n s390: don\u0027t use flush_scheduled_work()\n rtc: don\u0027t use flush_scheduled_work()\n mmc: update workqueue usages\n mfd: update workqueue usages\n dvb: don\u0027t use flush_scheduled_work()\n leds-wm8350: don\u0027t use flush_scheduled_work()\n mISDN: don\u0027t use flush_scheduled_work()\n macintosh/ams: don\u0027t use flush_scheduled_work()\n vmwgfx: don\u0027t use flush_scheduled_work()\n tpm: don\u0027t use flush_scheduled_work()\n sonypi: don\u0027t use flush_scheduled_work()\n hvsi: don\u0027t use flush_scheduled_work()\n xen: don\u0027t use flush_scheduled_work()\n gdrom: don\u0027t use flush_scheduled_work()\n ...\n\nFixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c\nas per Tejun.\n" }, { "commit": "4c306a9291a077879fc3e933326caac3bc319caa", "tree": "19704486012ac148ef37005ea38b9c2ae3442fc1", "parents": [ "ba27d85c96c57111ae8acfa959643e5ce8e4bcbe" ], "author": { "name": "Shan Wei", "email": "shanwei@cn.fujitsu.com", "time": "Sun Dec 19 21:59:35 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Dec 19 21:59:35 2010 -0800" }, "message": "net: kill unused macros\n\nThese macros never be used, so remove them.\n\nSigned-off-by: Shan Wei \u003cshanwei@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4aa9e05a61b845541fa6f5b1d246976922601f0", "tree": "ca94478c3df281ab76a3399f5ba6341ade3f5791", "parents": [ "1dc0f3c54ce1df957f99c17b145488fd03eb1a59", "4b8fe66300acb2fba8b16d62606e0d30204022fc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 17 12:27:22 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/bnx2x/bnx2x.h\n\tdrivers/net/wireless/iwlwifi/iwl-1000.c\n\tdrivers/net/wireless/iwlwifi/iwl-6000.c\n\tdrivers/net/wireless/iwlwifi/iwl-core.h\n\tdrivers/vhost/vhost.c\n" }, { "commit": "afe2c511fb2d75f1515081ff1be15bd79cfe722d", "tree": "28aa74e9e0c654a95bf3306101e10ac1d16919d1", "parents": [ "2d64672ed38721b7a3815009d79bfb90a1f34a17" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Dec 14 16:21:17 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Dec 15 10:56:11 2010 +0100" }, "message": "workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync()\n\ncancel_rearming_delayed_work[queue]() has been superceded by\ncancel_delayed_work_sync() quite some time ago. Convert all the\nin-kernel users. The conversions are completely equivalent and\ntrivial.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Evgeniy Polyakov \u003czbr@ioremap.net\u003e\nCc: Jeff Garzik \u003cjgarzik@pobox.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\nCc: netdev@vger.kernel.org\nCc: Anton Vorontsov \u003ccbou@mail.ru\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: \"J. Bruce Fields\" \u003cbfields@fieldses.org\u003e\nCc: Neil Brown \u003cneilb@suse.de\u003e\nCc: Alex Elder \u003caelder@sgi.com\u003e\nCc: xfs-masters@oss.sgi.com\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: netfilter-devel@vger.kernel.org\nCc: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: linux-nfs@vger.kernel.org\n" }, { "commit": "d9ca676bcb26e1fdff9265a3e70f697cd381c889", "tree": "72ab0bf8cb22291eb4e1a57329bb8e1df2b7649f", "parents": [ "fb890ae7d615f4b4f5689144b6832230ab2046aa" ], "author": { "name": "Dan Williams", "email": "dcbw@redhat.com", "time": "Wed Dec 08 19:40:47 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 10 15:45:05 2010 -0800" }, "message": "atm: correct sysfs \u0027device\u0027 link creation and parent relationships\n\nThe ATM subsystem was incorrectly creating the \u0027device\u0027 link for ATM\nnodes in sysfs. This led to incorrect device/parent relationships\nexposed by sysfs and udev. Instead of rolling the \u0027device\u0027 link by hand\nin the generic ATM code, pass each ATM driver\u0027s bus device down to the\nsysfs code and let sysfs do this stuff correctly.\n\nSigned-off-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5811662b15db018c740c57d037523683fd3e6123", "tree": "f820610a6024799a26699f22dc9a4ef5dee07978", "parents": [ "dd68ad2235b4625e0dc928b2b4c614d265f976d3" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Fri Nov 12 18:43:55 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 17 12:27:45 2010 -0800" }, "message": "net: use the macros defined for the members of flowi\n\nUse the macros defined for the members of flowi to clean the code up.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "37d668004289d202f71dc5bfdadf6c18b34577a2", "tree": "790fc68d58b4c6d83d269dc80bebe42601a676df", "parents": [ "ece49153b601d95bcebd45a6394e370972f0b0a0" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Nov 15 11:12:33 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 17 10:37:52 2010 -0800" }, "message": "net/atm: Remove unnecessary casts of netdev_priv\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5f05647dd81c11a6a165ccc8f0c1370b16f3bcb0", "tree": "7851ef1c93aa1aba7ef327ca4b75fd35e6d10f29", "parents": [ "02f36038c568111ad4fc433f6fa760ff5e38fab4", "ec37a48d1d16c30b655ac5280209edf52a6775d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 23 11:47:02 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Oct 23 11:47:02 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: (1699 commits)\n bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.\n vlan: Calling vlan_hwaccel_do_receive() is always valid.\n tproxy: use the interface primary IP address as a default value for --on-ip\n tproxy: added IPv6 support to the socket match\n cxgb3: function namespace cleanup\n tproxy: added IPv6 support to the TPROXY target\n tproxy: added IPv6 socket lookup function to nf_tproxy_core\n be2net: Changes to use only priority codes allowed by f/w\n tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled\n tproxy: added tproxy sockopt interface in the IPV6 layer\n tproxy: added udp6_lib_lookup function\n tproxy: added const specifiers to udp lookup functions\n tproxy: split off ipv6 defragmentation to a separate module\n l2tp: small cleanup\n nf_nat: restrict ICMP translation for embedded header\n can: mcp251x: fix generation of error frames\n can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set\n can-raw: add msg_flags to distinguish local traffic\n 9p: client code cleanup\n rds: make local functions/variables static\n ...\n\nFix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and\ndrivers/net/wireless/ath/ath9k/debug.c as per David\n" }, { "commit": "092e0e7e520a1fca03e13c9f2d157432a8657ff2", "tree": "451897252c4c08c4b5a8ef535da156f1e817e80b", "parents": [ "79f14b7c56d3b3ba58f8b43d1f70b9b71477a800", "776c163b1b93c8dfa5edba885bc2bfbc2d228a5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:52:56 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 10:52:56 2010 -0700" }, "message": "Merge branch \u0027llseek\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl\n\n* \u0027llseek\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:\n vfs: make no_llseek the default\n vfs: don\u0027t use BKL in default_llseek\n llseek: automatically add .llseek fop\n libfs: use generic_file_llseek for simple_attr\n mac80211: disallow seeks in minstrel debug code\n lirc: make chardev nonseekable\n viotape: use noop_llseek\n raw: use explicit llseek file operations\n ibmasmfs: use generic_file_llseek\n spufs: use llseek in all file operations\n arm/omap: use generic_file_llseek in iommu_debug\n lkdtm: use generic_file_llseek in debugfs\n net/wireless: use generic_file_llseek in debugfs\n drm: use noop_llseek\n" }, { "commit": "6038f373a3dc1f1c26496e60b6c40b164716f07e", "tree": "a0d3bbd026eea41b9fc36b8c722cbaf56cd9f825", "parents": [ "1ec5584e3edf9c4bf2c88c846534d19cf986ba11" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sun Aug 15 18:52:59 2010 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Oct 15 15:53:27 2010 +0200" }, "message": "llseek: automatically add .llseek fop\n\nAll file_operations should get a .llseek operation so we can make\nnonseekable_open the default for future file operations without a\n.llseek pointer.\n\nThe three cases that we can automatically detect are no_llseek, seq_lseek\nand default_llseek. For cases where we can we can automatically prove that\nthe file offset is always ignored, we use noop_llseek, which maintains\nthe current behavior of not returning an error from a seek.\n\nNew drivers should normally not use noop_llseek but instead use no_llseek\nand call nonseekable_open at open time. Existing drivers can be converted\nto do the same when the maintainer knows for certain that no user code\nrelies on calling seek on the device file.\n\nThe generated code is often incorrectly indented and right now contains\ncomments that clarify for each added line why a specific variant was\nchosen. In the version that gets submitted upstream, the comments will\nbe gone and I will manually fix the indentation, because there does not\nseem to be a way to do that using coccinelle.\n\nSome amount of new code is currently sitting in linux-next that should get\nthe same modifications, which I will do at the end of the merge window.\n\nMany thanks to Julia Lawall for helping me learn to write a semantic\npatch that does all this.\n\n\u003d\u003d\u003d\u003d\u003d begin semantic patch \u003d\u003d\u003d\u003d\u003d\n// This adds an llseek\u003d method to all file operations,\n// as a preparation for making no_llseek the default.\n//\n// The rules are\n// - use no_llseek explicitly if we do nonseekable_open\n// - use seq_lseek for sequential files\n// - use default_llseek if we know we access f_pos\n// - use noop_llseek if we know we don\u0027t access f_pos,\n// but we still want to allow users to call lseek\n//\n@ open1 exists @\nidentifier nested_open;\n@@\nnested_open(...)\n{\n\u003c+...\nnonseekable_open(...)\n...+\u003e\n}\n\n@ open exists@\nidentifier open_f;\nidentifier i, f;\nidentifier open1.nested_open;\n@@\nint open_f(struct inode *i, struct file *f)\n{\n\u003c+...\n(\nnonseekable_open(...)\n|\nnested_open(...)\n)\n...+\u003e\n}\n\n@ read disable optional_qualifier exists @\nidentifier read_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\nexpression E;\nidentifier func;\n@@\nssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)\n{\n\u003c+...\n(\n *off \u003d E\n|\n *off +\u003d E\n|\n func(..., off, ...)\n|\n E \u003d *off\n)\n...+\u003e\n}\n\n@ read_no_fpos disable optional_qualifier exists @\nidentifier read_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\n@@\nssize_t read_f(struct file *f, char *p, size_t s, loff_t *off)\n{\n... when !\u003d off\n}\n\n@ write @\nidentifier write_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\nexpression E;\nidentifier func;\n@@\nssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)\n{\n\u003c+...\n(\n *off \u003d E\n|\n *off +\u003d E\n|\n func(..., off, ...)\n|\n E \u003d *off\n)\n...+\u003e\n}\n\n@ write_no_fpos @\nidentifier write_f;\nidentifier f, p, s, off;\ntype ssize_t, size_t, loff_t;\n@@\nssize_t write_f(struct file *f, const char *p, size_t s, loff_t *off)\n{\n... when !\u003d off\n}\n\n@ fops0 @\nidentifier fops;\n@@\nstruct file_operations fops \u003d {\n ...\n};\n\n@ has_llseek depends on fops0 @\nidentifier fops0.fops;\nidentifier llseek_f;\n@@\nstruct file_operations fops \u003d {\n...\n .llseek \u003d llseek_f,\n...\n};\n\n@ has_read depends on fops0 @\nidentifier fops0.fops;\nidentifier read_f;\n@@\nstruct file_operations fops \u003d {\n...\n .read \u003d read_f,\n...\n};\n\n@ has_write depends on fops0 @\nidentifier fops0.fops;\nidentifier write_f;\n@@\nstruct file_operations fops \u003d {\n...\n .write \u003d write_f,\n...\n};\n\n@ has_open depends on fops0 @\nidentifier fops0.fops;\nidentifier open_f;\n@@\nstruct file_operations fops \u003d {\n...\n .open \u003d open_f,\n...\n};\n\n// use no_llseek if we call nonseekable_open\n////////////////////////////////////////////\n@ nonseekable1 depends on !has_llseek \u0026\u0026 has_open @\nidentifier fops0.fops;\nidentifier nso ~\u003d \"nonseekable_open\";\n@@\nstruct file_operations fops \u003d {\n... .open \u003d nso, ...\n+.llseek \u003d no_llseek, /* nonseekable */\n};\n\n@ nonseekable2 depends on !has_llseek @\nidentifier fops0.fops;\nidentifier open.open_f;\n@@\nstruct file_operations fops \u003d {\n... .open \u003d open_f, ...\n+.llseek \u003d no_llseek, /* open uses nonseekable */\n};\n\n// use seq_lseek for sequential files\n/////////////////////////////////////\n@ seq depends on !has_llseek @\nidentifier fops0.fops;\nidentifier sr ~\u003d \"seq_read\";\n@@\nstruct file_operations fops \u003d {\n... .read \u003d sr, ...\n+.llseek \u003d seq_lseek, /* we have seq_read */\n};\n\n// use default_llseek if there is a readdir\n///////////////////////////////////////////\n@ fops1 depends on !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier readdir_e;\n@@\n// any other fop is used that changes pos\nstruct file_operations fops \u003d {\n... .readdir \u003d readdir_e, ...\n+.llseek \u003d default_llseek, /* readdir is present */\n};\n\n// use default_llseek if at least one of read/write touches f_pos\n/////////////////////////////////////////////////////////////////\n@ fops2 depends on !fops1 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read.read_f;\n@@\n// read fops use offset\nstruct file_operations fops \u003d {\n... .read \u003d read_f, ...\n+.llseek \u003d default_llseek, /* read accesses f_pos */\n};\n\n@ fops3 depends on !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier write.write_f;\n@@\n// write fops use offset\nstruct file_operations fops \u003d {\n... .write \u003d write_f, ...\n+\t.llseek \u003d default_llseek, /* write accesses f_pos */\n};\n\n// Use noop_llseek if neither read nor write accesses f_pos\n///////////////////////////////////////////////////////////\n\n@ fops4 depends on !fops1 \u0026\u0026 !fops2 \u0026\u0026 !fops3 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read_no_fpos.read_f;\nidentifier write_no_fpos.write_f;\n@@\n// write fops use offset\nstruct file_operations fops \u003d {\n...\n .write \u003d write_f,\n .read \u003d read_f,\n...\n+.llseek \u003d noop_llseek, /* read and write both use no f_pos */\n};\n\n@ depends on has_write \u0026\u0026 !has_read \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier write_no_fpos.write_f;\n@@\nstruct file_operations fops \u003d {\n... .write \u003d write_f, ...\n+.llseek \u003d noop_llseek, /* write uses no f_pos */\n};\n\n@ depends on has_read \u0026\u0026 !has_write \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\nidentifier read_no_fpos.read_f;\n@@\nstruct file_operations fops \u003d {\n... .read \u003d read_f, ...\n+.llseek \u003d noop_llseek, /* read uses no f_pos */\n};\n\n@ depends on !has_read \u0026\u0026 !has_write \u0026\u0026 !fops1 \u0026\u0026 !fops2 \u0026\u0026 !has_llseek \u0026\u0026 !nonseekable1 \u0026\u0026 !nonseekable2 \u0026\u0026 !seq @\nidentifier fops0.fops;\n@@\nstruct file_operations fops \u003d {\n...\n+.llseek \u003d noop_llseek, /* no read or write fn */\n};\n\u003d\u003d\u003d\u003d\u003d End semantic patch \u003d\u003d\u003d\u003d\u003d\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Julia Lawall \u003cjulia@diku.dk\u003e\nCc: Christoph Hellwig \u003chch@infradead.org\u003e\n" }, { "commit": "d122179a3c0fdc71b88cb9e3605f372b1651a9ff", "tree": "63a48b333e7565967b6d7c9e246557bfcb9f225f", "parents": [ "419c20465d6319274e7286f0966e2390540e6e0a", "b00916b189d13a615ff05c9242201135992fcda3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 11 12:30:34 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 11 12:30:34 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/core/ethtool.c\n" }, { "commit": "5518b29f225dbdf47ded02cf229ff8225a2cdf82", "tree": "63ff04e7b339623e41ba0d2d27b67bd4ae81bab3", "parents": [ "f1ee89d5b007620353fb7dec1d34db4baa1a5571" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Sun Oct 10 22:46:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 11 11:05:42 2010 -0700" }, "message": "ATM: mpc, fix use after free\n\nStanse found that mpc_push frees skb and then it dereferences it. It\nis a typo, new_skb should be dereferenced there.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d6bf781712a1d25cc8987036b3a48535b331eb91", "tree": "cf83ab68ef2519576578d8336a43cc13cd375cde", "parents": [ "110b2499370c401cdcc7c63e481084467291d556" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Oct 04 06:15:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Oct 05 14:54:36 2010 -0700" }, "message": "net neigh: RCU conversion of neigh hash table\n\nDavid\n\nThis is the first step for RCU conversion of neigh code.\n\nNext patches will convert hash_buckets[] and \"struct neighbour\" to RCU\nprotected objects.\n\nThanks\n\n[PATCH net-next] net neigh: RCU conversion of neigh hash table\n\nInstead of storing hash_buckets, hash_mask and hash_rnd in \"struct\nneigh_table\", a new structure is defined :\n\nstruct neigh_hash_table {\n struct neighbour **hash_buckets;\n unsigned int hash_mask;\n __u32 hash_rnd;\n struct rcu_head rcu;\n};\n\nAnd \"struct neigh_table\" has an RCU protected pointer to such a\nneigh_hash_table.\n\nThis means the signature of (*hash)() function changed: We need to add a\nthird parameter with the actual hash_rnd value, since this is not\nanymore a neigh_table field.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e40051d134f7ee95c8c1f7a3471e84eafc9ab326", "tree": "88eb44e49a75721ae926665a2c42f08badac9d07", "parents": [ "42099d7a3941d4aaf853caac92b3ae76149fc6e7", "2cc6d2bf3d6195fabcf0febc192c01f99519a8f3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 27 01:03:03 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/qlcnic/qlcnic_init.c\n\tnet/ipv4/ip_output.c\n" }, { "commit": "a3d6713fbd2ccb50898a6f88664da96a7857c039", "tree": "e772805828ad8c862c10b1845878baffbb11248e", "parents": [ "ca9a783575d2affed30ef27a3427a7705527ddac" ], "author": { "name": "Karl Hiramoto", "email": "karl@hiramoto.org", "time": "Thu Sep 23 01:50:54 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 26 18:29:18 2010 -0700" }, "message": "br2684: fix scheduling while atomic\n\nYou can\u0027t call atomic_notifier_chain_unregister() while in atomic context.\n\nFix, call un/register_atmdevice_notifier in module __init and __exit.\n\nBug report:\nhttp://comments.gmane.org/gmane.linux.network/172603\n\nReported-by: Mikko Vinni \u003cmmvinni@yahoo.com\u003e\nTested-by: Mikko Vinni \u003cmmvinni@yahoo.com\u003e\nSigned-off-by: Karl Hiramoto \u003ckarl@hiramoto.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b92840900fb575004cac694e56fd0a43f54dc344", "tree": "29e20d684393515c7278427f46dd804a0d66f74f", "parents": [ "bb2537f1e76b3fb18c3fc1dff1df98ebc10af633" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Wed Aug 18 10:44:34 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 19 00:14:36 2010 -0700" }, "message": "atm: remove a net_device_stats clear\n\nNo need to clear device stats in lec_open()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "510a05edce43ec29ceb105677ad8e6ff58f02c72", "tree": "2aebf21b04ad5b095b7bd4c51b47e8bdb22fbb7a", "parents": [ "354c8e3104a8513dbbdc4dea1ffbefe714371e88" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Thu Aug 05 10:19:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 21:06:26 2010 -0700" }, "message": "net/atm: Adjust confusing if indentation\n\nOutdent the code following an if.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r disable braces4@\nposition p1,p2;\nstatement S1,S2;\n@@\n\n(\nif (...) { ... }\n|\nif (...) S1@p1 S2@p2\n)\n\n@script:python@\np1 \u003c\u003c r.p1;\np2 \u003c\u003c r.p2;\n@@\n\nif (p1[0].column \u003d\u003d p2[0].column):\n cocci.print_main(\"branch\",p1)\n cocci.print_secs(\"after\",p2)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d7100da026317fcf07411f765fe1cdb044053917", "tree": "97e9ecbde1575173684a357ad00960384ec7d1db", "parents": [ "3b5bac2bdea1de832bdd8e2c904ab7c9479ff9ed" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Wed Aug 04 07:34:36 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 21:53:17 2010 -0700" }, "message": "ppp: make channel_ops const\n\nThe PPP channel ops structure should be const.\nCleanup the declarations to use standard C99 format.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "005066122b58f3b350736cc896af46aea2e32d23", "tree": "011565f0e88cf6103c1974ae20ef56d90a6c5070", "parents": [ "7313bb8f3dd6e28bcf9c42adfd54a5cf9a4949e0" ], "author": { "name": "Karl Hiramoto", "email": "karl@hiramoto.org", "time": "Thu Jul 08 20:55:31 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 09 00:09:21 2010 -0700" }, "message": "atm/br2684: register notifier event for carrier signal changes.\n\nWhen a signal change event occurs call netif_carrier_on/off.\n\nSigned-off-by: Karl Hiramoto \u003ckarl@hiramoto.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7313bb8f3dd6e28bcf9c42adfd54a5cf9a4949e0", "tree": "65d8486a2ff4aabc23e0b021f068dd3788081923", "parents": [ "68dc9d36c19aa1fd1633427b419d5e1f44753e8a" ], "author": { "name": "Karl Hiramoto", "email": "karl@hiramoto.org", "time": "Thu Jul 08 20:55:30 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jul 09 00:09:20 2010 -0700" }, "message": "atm: propagate signal changes via notifier\n\nAdd notifier chain for changes in atm_dev.\n\nClients like br2684 will call register_atmdevice_notifier() to be notified of\nchanges. Drivers will call atm_dev_signal_change() to notify clients like\nbr2684 of the change.\n\nOn DSL and ATM devices it\u0027s usefull to have a know if you have a carrier\nsignal. netdevice LOWER_UP changes can be propagated to userspace via netlink\nmonitor.\n\nSigned-off-by: Karl Hiramoto \u003ckarl@hiramoto.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d8d1f30b95a635dbd610dcc5eb641aca8f4768cf", "tree": "71424d82a96facd5fcf05cc769ef2ba52b584aeb", "parents": [ "592fcb9dfafaa02dd0edc207bf5d3a0ee7a1f8df" ], "author": { "name": "Changli Gao", "email": "xiaosuo@gmail.com", "time": "Thu Jun 10 23:31:35 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 10 23:31:35 2010 -0700" }, "message": "net-next: remove useless union keyword\n\nremove useless union keyword in rtable, rt6_info and dn_route.\n\nSince there is only one member in a union, the union keyword isn\u0027t useful.\n\nSigned-off-by: Changli Gao \u003cxiaosuo@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3fa21e07e6acefa31f974d57fba2b6920a7ebd1a", "tree": "4254644ef2579e9ac96db6ec0535b5e4231fd18e", "parents": [ "b60b6592baa69c43a5a0f55d6300a7feaab15338" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon May 17 23:08:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon May 17 23:23:14 2010 -0700" }, "message": "net: Remove unnecessary returns from void function()s\n\nThis patch removes from net/ (but not any netfilter files)\nall the unnecessary return; statements that precede the\nlast closing brace of void functions.\n\nIt does not remove the returns that are immediately\npreceded by a label as gcc doesn\u0027t like that.\n\nDone via:\n$ grep -rP --include\u003d*.[ch] -l \"return;\\n}\" net/ | \\\n xargs perl -i -e \u0027local $/ ; while (\u003c\u003e) { s/\\n[ \\t\\n]+return;\\n}/\\n}/g; print; }\u0027\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "43815482370c510c569fd18edb57afcb0fa8cab6", "tree": "063efaae3758402b84f056438b704d1de68f7837", "parents": [ "83d7eb2979cd3390c375470225dd2d8f2009bc70" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Apr 29 11:01:49 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat May 01 15:00:15 2010 -0700" }, "message": "net: sock_def_readable() and friends RCU conversion\n\nsk_callback_lock rwlock actually protects sk-\u003esk_sleep pointer, so we\nneed two atomic operations (and associated dirtying) per incoming\npacket.\n\nRCU conversion is pretty much needed :\n\n1) Add a new structure, called \"struct socket_wq\" to hold all fields\nthat will need rcu_read_lock() protection (currently: a\nwait_queue_head_t and a struct fasync_struct pointer).\n\n[Future patch will add a list anchor for wakeup coalescing]\n\n2) Attach one of such structure to each \"struct socket\" created in\nsock_alloc_inode().\n\n3) Respect RCU grace period when freeing a \"struct socket_wq\"\n\n4) Change sk_sleep pointer in \"struct sock\" by sk_wq, pointer to \"struct\nsocket_wq\"\n\n5) Change sk_sleep() function to use new sk-\u003esk_wq instead of\nsk-\u003esk_sleep\n\n6) Change sk_has_sleeper() to wq_has_sleeper() that must be used inside\na rcu_read_lock() section.\n\n7) Change all sk_has_sleeper() callers to :\n - Use rcu_read_lock() instead of read_lock(\u0026sk-\u003esk_callback_lock)\n - Use wq_has_sleeper() to eventually wakeup tasks.\n - Use rcu_read_unlock() instead of read_unlock(\u0026sk-\u003esk_callback_lock)\n\n8) sock_wake_async() is modified to use rcu protection as well.\n\n9) Exceptions :\n macvtap, drivers/net/tun.c, af_unix use integrated \"struct socket_wq\"\ninstead of dynamically allocated ones. They dont need rcu freeing.\n\nSome cleanups or followups are probably needed, (possible\nsk_callback_lock conversion to a spinlock for example...).\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aa395145165cb06a0d0885221bbe0ce4a564391d", "tree": "118b0403621f10db8dc3dbf12079f9af5b19e05d", "parents": [ "ab9304717f7624c41927f442e6b6d418b2d8b3e4" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Tue Apr 20 13:03:51 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 16:37:13 2010 -0700" }, "message": "net: sk_sleep() helper\n\nDefine a new function to return the waitqueue of a \"struct sock\".\n\nstatic inline wait_queue_head_t *sk_sleep(struct sock *sk)\n{\n\treturn sk-\u003esk_sleep;\n}\n\nChange all read occurrences of sk_sleep by a call to this function.\n\nNeeded for a future RCU conversion. sk_sleep wont be a field directly\navailable.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "871039f02f8ec4ab2e5e9010718caa8e085786f1", "tree": "f0d2b3127fc48c862967d68c46c2d46668137515", "parents": [ "e4077e018b5ead3de9951fc01d8bf12eeeeeefed", "4a1032faac94ebbf647460ae3e06fc21146eb280" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 11 14:53:53 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/stmmac/stmmac_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_cmd.c\n\tdrivers/net/wireless/wl12xx/wl1271_main.c\n\tdrivers/net/wireless/wl12xx/wl1271_spi.c\n\tnet/core/ethtool.c\n\tnet/mac80211/scan.c\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "62c97ac04a67c120ec37a9bfd445a8d5dbbc1ed2", "tree": "8195733812f43e1bb547e916fb718b3135c67eb8", "parents": [ "283f2fe87e980d8af5ad8aa63751e7e3258ee05a" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Thu Mar 18 13:48:26 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Mar 21 18:34:15 2010 -0700" }, "message": "atm: Use kasprintf\n\nUse kasprintf in atm_proc_dev_register()\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "67de792420be2daa1c6fec07ec8552af9ea0bde3", "tree": "5a0141ea6d3d0f6557a6bd9ec3351d00d6a95f58", "parents": [ "a2b79b414df97a70c33f874b631e06830431d233" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon Feb 08 23:21:51 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Feb 10 12:31:10 2010 -0800" }, "message": "net: atm: use seq_list_foo() helpers\n\nSimplify seq_file code.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b50c2ea72a8ed6bc2a954019b6feb6ca41fce07e", "tree": "0144f31cb8638cfb051bae879dbcfcbf2a28f80d", "parents": [ "b4c84ec0fd9ec2297b796443051554d062007ba3" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:20 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:05 2010 -0800" }, "message": "net/atm: Cleanup dprint/ddprintk #defines and uses\n\nMove \"mpoa:%s: \", __func__/__FILE__ to #defines\nRemove mpoa __func__/__FILE__ from dprintk uses\nAdd and use #define dprint_cont where appropriate\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b4c84ec0fd9ec2297b796443051554d062007ba3", "tree": "393f5c2976589a6c6771805ad326b4e5eb56dc74", "parents": [ "b7d9371befd6fa3eb0ad9d574860095642bf70ed" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:19 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:05 2010 -0800" }, "message": "net/atm/lec.c: Add __lec_arp_check_expire and other cleanups\n\nReduce indentation in lec_arp_check_expire\nIndent a case label\nRemove !\u003d NULL logical tests from while ((skb \u003d foo())) assign and tests\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7d9371befd6fa3eb0ad9d574860095642bf70ed", "tree": "80b78818f998b20fbe1afbaf1f84af5483366854", "parents": [ "0ec96e656fcd4a8ea8cb0e92f90ab4bb6f79cada" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:18 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:04 2010 -0800" }, "message": "net/atm/svc.c: checkpatch cleanups\n\nConvert #include \u003casm... to #include \u003clinux...\nSpacing cleanups\nMostly 80 column wrapped\nMove trailing statements to new lines\nswitch/case cleanups\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0ec96e656fcd4a8ea8cb0e92f90ab4bb6f79cada", "tree": "055222355c8f48010720c7a1ebd52c951f2f3ed5", "parents": [ "07b54c9ad4804bdd546d3db0889b0db381c726e3" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:17 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:04 2010 -0800" }, "message": "net/atm/signaling.c: checkpatch cleanups\n\nMostly 80 column wrapped.\nMove embedded assigns out of tests\nMove trailing statements to new lines\nswitch/case cleanups\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "07b54c9ad4804bdd546d3db0889b0db381c726e3", "tree": "44ccc08a24de057f5f7cec298fd062760fd76f13", "parents": [ "fa61f0cac8b91e671eb0ba27a4972c7e72a909a6" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:03 2010 -0800" }, "message": "net/atm/resources.c: checkpatch cleanups\n\nSpacing cleanups\nMostly 80 column wrapped.\nMove embedded assigns out of tests\nMove trailing statements to new lines\nswitch/case cleanups\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa61f0cac8b91e671eb0ba27a4972c7e72a909a6", "tree": "28fa066869f4544fe04c560dd61901a35fc77de4", "parents": [ "6b6dd498f409463635c4f29a3a49585bc7e5d43e" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:03 2010 -0800" }, "message": "net/atm/raw.c: checkpatch cleanups\n\nSpacing cleanups\nMostly 80 column wrapped.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b6dd498f409463635c4f29a3a49585bc7e5d43e", "tree": "95570ba974201832b8bc9d3968ad4ff6167477be", "parents": [ "07367adbe5f18b6b7a7476094181ff99cd90cb7e" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:14 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:02 2010 -0800" }, "message": "net/atm/pvc.c: checkpatch cleanups\n\nSpacing cleanups\nMostly 80 column wrapped.\nMove trailing statements to new lines\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "07367adbe5f18b6b7a7476094181ff99cd90cb7e", "tree": "739508f7d7c7f6855f3593faf221a070be1bcafe", "parents": [ "d81219db6add0a176c37d6fe4e1c050778de9d2f" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:13 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:02 2010 -0800" }, "message": "net/atm/proc.c: checkpatch cleanups\n\nConvert #include \u003casm... to #include \u003clinux...\nMostly 80 column wrapped.\nSpacing cleanups\nMove trailing statements to new lines\nswitch/case cleanups\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d81219db6add0a176c37d6fe4e1c050778de9d2f", "tree": "f4b1d7d55a69db10214d98fd4a2c644121cef3be", "parents": [ "f1e100491e0e696b19f37f2b0cf728a5f2bc56e7" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:12 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:01 2010 -0800" }, "message": "net/atm/pppoatm.c: checkpatch cleanups\n\nMove embedded assigns out of tests\nMove trailing statements to new lines\nMove labels to column 1\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f1e100491e0e696b19f37f2b0cf728a5f2bc56e7", "tree": "69f2ed2e4eab1dfac4bae180e84a6e647f9adaaa", "parents": [ "bee67d34b2dd495feafb1a37b5ea2d6179b74178" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:11 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:01 2010 -0800" }, "message": "net/atm/mpoa_proc.c: checkpatch cleanups\n\nConvert #include \u003casm... to #include \u003clinux...\nAdd printk argument verification to dprintk and ddprintk\nSpacing cleanups\nMostly 80 column wrapped.\nRemoved unnecessary breaks after returns\nUse %pI4 in seq_printf of IP address\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bee67d34b2dd495feafb1a37b5ea2d6179b74178", "tree": "52e4d5888eef06807b090ccebdd1f71846fcd8dd", "parents": [ "5710044073ea734c0d7806d7fb9cd6308053704b" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:10 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:01 2010 -0800" }, "message": "net/atm/mpoa_caches.c: checkpatch cleanups\n\nConvert #include \u003casm... to #include \u003clinux...\nAdd printk argument verification to dprintk and ddprintk\nSpacing cleanups\nMostly 80 column wrapped.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5710044073ea734c0d7806d7fb9cd6308053704b", "tree": "de8cdf8c20b8ebc2248ad76dcbd67980cdf9ac46", "parents": [ "c48192a7075fb218d92810fbe76ddd8732f2bbb8" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:00 2010 -0800" }, "message": "net/atm/mpc.c: checkpatch cleanups\n\nConvert #include \u003casm... to #include \u003clinux...\nAdd printk argument verification to dprintk and ddprintk\nSpacing cleanups\nMostly 80 column wrapped.\nprintk-\u003epr_info and pr_cont\nMoved labels to column 1\nMove trailing statements to new lines\nswitch/case cleanups\n\tremove unnecessary breaks after returns\nRemove unnecessary braces around single line statements\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c48192a7075fb218d92810fbe76ddd8732f2bbb8", "tree": "5f4959f6e1ce0ae904e34281c0f6ff3a36756fed", "parents": [ "5ff7ef7911d100b6568c731b1d078f819da82d03" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:08 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:16:00 2010 -0800" }, "message": "net/atm/lec.c: checkpatch cleanups\n\nConvert #include \u003casm... to #include \u003clinux...\nMostly 80 column wrapped.\nSpacing cleanups\nConvert printks to pr_\u003clevel\u003e\nUse print_hex_dump\nMove embedded assigns out of tests\nMove trailing statements to new lines\nRemove unnecessary braces around single line statements\nswitch/case cleanups\nRemoved paren around returns\nUse %pM\nMoved leading continuation logical tests to end of previous line\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5ff7ef7911d100b6568c731b1d078f819da82d03", "tree": "d723b682b0828f48af7e0184dbd0e5da64d8412c", "parents": [ "a8147d737bd37bd51bb01737ac9c17a2cfc02a38" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:07 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:15:59 2010 -0800" }, "message": "net/atm/ioctl.c: checkpatch cleanups\n\nSpacing cleanups\nMoved EXPORT_SYMBOL\nMostly 80 column wrapped.\nswitch/case cleanups\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a8147d737bd37bd51bb01737ac9c17a2cfc02a38", "tree": "dcdfccc62918b176e1c3a6dc4d8820651a8de200", "parents": [ "e956ea1b7de1df5ae4d6dc3e7460ed9e140803cd" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:15:59 2010 -0800" }, "message": "net/atm/common.c: checkpatch cleanups\n\nConvert #include \u003casm... to #include \u003clinux...\nMove EXPORT_SYMBOL\nSpacing cleanups\nUse __func__ in printks\nIndent switch/case statements\nMove trailing statements to new line\nHoist assigns from if tests\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e956ea1b7de1df5ae4d6dc3e7460ed9e140803cd", "tree": "8f3efa93a7eb0864a6943dd075875db98bca8794", "parents": [ "641d729eb6236db0ce33e2b07a7f93193e60ea5a" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:05 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:15:58 2010 -0800" }, "message": "net/atm/clip.c: checkpatch cleanups\n\nConvert #include \u003casm... to #include \u003clinux...\nSpacing cleanups\nMove labels to column 1\nMove logical continuation tests to end of previous line\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "641d729eb6236db0ce33e2b07a7f93193e60ea5a", "tree": "a437b774ab890a5731a0f361c263bab44d1615b6", "parents": [ "f0a6cb118d7f9e72799a9c0c13f75d1b236a6546" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:04 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:15:58 2010 -0800" }, "message": "net/atm/br2684.c: checkpatch cleanups\n\nConvert #include \u003casm... to #include \u003clinux...\nUse print_hex_dump\nSpacing cleanups\nMove logical continuation tests to end of previous line\n80 column wrapping\nMove goto branch label to column 1\nRemove unnecessary single statement braces\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f0a6cb118d7f9e72799a9c0c13f75d1b236a6546", "tree": "2a09aea2c483abc53cf021d28081d0694a599f78", "parents": [ "3356b4d41605f9b0977b0963c65f466eee213fe9" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:03 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:15:57 2010 -0800" }, "message": "net/atm/atm_sysfs.c: checkpatch cleanups\n\nAdd space after for\nIndent switch/case statements\n80 column wrapping\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3356b4d41605f9b0977b0963c65f466eee213fe9", "tree": "1594dabd6b290c66d0777f3868dc1b28b52c7dee", "parents": [ "c39f01d7883f944ae75961cc1a31d348c7970599" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:02 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:15:57 2010 -0800" }, "message": "net/atm/atm_misc.c: checkpatch cleanups\n\nMoved EXPORT_SYMBOL to follow definition\nAdd space after commas\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c39f01d7883f944ae75961cc1a31d348c7970599", "tree": "bc8cb50dc0f7d6c3e1ec36be1f65d692c65db65d", "parents": [ "99824461ea72ca0044cc6508f02c0e1cabf37ba5" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:01 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:15:56 2010 -0800" }, "message": "net/atm/addr.c: Convert include \u003casm to include \u003clinux\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "99824461ea72ca0044cc6508f02c0e1cabf37ba5", "tree": "8672e525869778c9d4c12fe3982306387995bf2a", "parents": [ "b747caf365b4121903b26d1cd65454c7bc607184" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Tue Jan 26 11:40:00 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:15:56 2010 -0800" }, "message": "net/atm: Convert printk to pr_\u003clevel\u003e\n\nAdd #define pr_fmt(fmt) KBUILD_MODNAME \":%s: \" fmt, __func__\nRemove function names from output\nUse single line pr_debug instead of broken multiple uses without newline\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2e302ebfeac04beb5a5d6af1ac583c6a1fb76d1a", "tree": "8b15d52b73905f89184c91fb146c1b216d71bc8f", "parents": [ "504bb3b58e7314e0fe026da280e8168c1314be3d" ], "author": { "name": "chas williams - CONTRACTOR", "email": "chas@cmf.nrl.navy.mil", "time": "Fri Dec 04 11:06:32 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:22:31 2009 -0800" }, "message": "atm: [br2684] allow routed mode operation again\n\nin routed mode, we don\u0027t have a hardware address so netdev_ops doesnt\nneed to validate our hardware address via .ndo_validate_addr\n\nReported-by: Manuel Fuentes \u003cmfuentes@agenciaefe.com\u003e\nSigned-off-by: Chas Williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eb0445887a45a3705522aac6c2d8367e90358792", "tree": "12b489c8b9a1092fafa558c0496ef2ef1c3f7b6c", "parents": [ "2a8875e73ffb18165ceb245f99c2ccad77378051" ], "author": { "name": "chas williams - CONTRACTOR", "email": "chas@cmf.nrl.navy.mil", "time": "Fri Dec 04 05:19:30 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 08 20:22:30 2009 -0800" }, "message": "atm: [lec] initialize .netdev_ops before calling register_netdev()\n\nfix oops when initializing lane interfaces. lec should probably be\nchanged to use alloc_netdev() instead.\n\nSigned-off-by: Chas Williams - CONTRACTOR \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "09ad9bc752519cc167d0a573e1acf69b5c707c67", "tree": "0e190a9ffb90d7e0534136c3e9f31dce02f423c3", "parents": [ "4ba3eb034fb6fd1990ccc5a6d71d5abcda37b905" ], "author": { "name": "Octavian Purdila", "email": "opurdila@ixiacom.com", "time": "Wed Nov 25 15:14:13 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 25 15:14:13 2009 -0800" }, "message": "net: use net_eq to compare nets\n\nGenerated with the following semantic patch\n\n@@\nstruct net *n1;\nstruct net *n2;\n@@\n- n1 \u003d\u003d n2\n+ net_eq(n1, n2)\n\n@@\nstruct net *n1;\nstruct net *n2;\n@@\n- n1 !\u003d n2\n+ !net_eq(n1, n2)\n\napplied over {include,net,drivers/net}.\n\nSigned-off-by: Octavian Purdila \u003copurdila@ixiacom.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "805003a41c035ccbe37d3d5ef5e6df8874346b5a", "tree": "55828a6642fc6f974842cea3387f2625ec9499b3", "parents": [ "a2116ed223c88b6c424f42398e54d1607dc785ba" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 11 03:45:22 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 11 19:22:23 2009 -0800" }, "message": "net/atm: move all compat_ioctl handling to atm/ioctl.c\n\nWe have two implementations of the compat_ioctl handling for ATM, the\none that we have had for ages in fs/compat_ioctl.c and the one added to\nnet/atm/ioctl.c by David Woodhouse. Unfortunately, both versions are\nincomplete, and in practice we use a very confusing combination of the\ntwo.\n\nFor ioctl numbers that have the same identifier on 32 and 64 bit systems,\nwe go directly through the compat_ioctl socket operation, for those that\n\ndiffer, we do a conversion in fs/compat_ioctl.c.\n\nThis patch moves both variants into the vcc_compat_ioctl() function,\nwhile preserving the current behaviour. It also kills off the COMPATIBLE_IOCTL\ndefinitions that we never use here.\nDoing it this way is clearly not a good solution, but I hope it is a\nstep into the right direction, so that someone is able to clean up this\nmess for real.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3f378b684453f2a028eda463ce383370545d9cc9", "tree": "dc50d087e137c6d173e25ae10ecd0f10823eca7a", "parents": [ "13f18aa05f5abe135f47b6417537ae2b2fedc18c" ], "author": { "name": "Eric Paris", "email": "eparis@redhat.com", "time": "Thu Nov 05 22:18:14 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Nov 05 22:18:14 2009 -0800" }, "message": "net: pass kern to net_proto_family create function\n\nThe generic __sock_create function has a kern argument which allows the\nsecurity system to make decisions based on if a socket is being created by\nthe kernel or by userspace. This patch passes that flag to the\nnet_proto_family specific create function, so it can do the same thing.\n\nSigned-off-by: Eric Paris \u003ceparis@redhat.com\u003e\nAcked-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3b885787ea4112eaa80945999ea0901bf742707f", "tree": "06fc15f8e8083d5652ccb4d06653d9812dce9c0b", "parents": [ "d5e63bded6e819ca77ee1a1d97c783a31f6caf30" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Mon Oct 12 13:26:31 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 12 13:26:31 2009 -0700" }, "message": "net: Generalize socket rx gap / receive queue overflow cmsg\n\nCreate a new socket level option to report number of queue overflows\n\nRecently I augmented the AF_PACKET protocol to report the number of frames lost\non the socket receive queue between any two enqueued frames. This value was\nexported via a SOL_PACKET level cmsg. AFter I completed that work it was\nrequested that this feature be generalized so that any datagram oriented socket\ncould make use of this option. As such I\u0027ve created this patch, It creates a\nnew SOL_SOCKET level option called SO_RXQ_OVFL, which when enabled exports a\nSOL_SOCKET level cmsg that reports the nubmer of times the sk_receive_queue\noverflowed between any two given frames. It also augments the AF_PACKET\nprotocol to take advantage of this new feature (as it previously did not touch\nsk-\u003esk_drops, which this patch uses to record the overflow count). Tested\nsuccessfully by me.\n\nNotes:\n\n1) Unlike my previous patch, this patch simply records the sk_drops value, which\nis not a number of drops between packets, but rather a total number of drops.\nDeltas must be computed in user space.\n\n2) While this patch currently works with datagram oriented protocols, it will\nalso be accepted by non-datagram oriented protocols. I\u0027m not sure if thats\nagreeable to everyone, but my argument in favor of doing so is that, for those\nprotocols which aren\u0027t applicable to this option, sk_drops will always be zero,\nand reporting no drops on a receive queue that isn\u0027t used for those\nnon-participating protocols seems reasonable to me. This also saves us having\nto code in a per-protocol opt in mechanism.\n\n3) This applies cleanly to net-next assuming that commit\n977750076d98c7ff6cbda51858bb5a5894a9d9ab (my af packet cmsg patch) is reverted\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec1b4cf74c81bfd0fbe5bf62bafc86c45917e72f", "tree": "1b693e4e027f3e42224e6221ae018daeb562e5e1", "parents": [ "f7734fdf61ec6bb848e0bafc1fb8bad2c124bb50" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Oct 05 05:58:39 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Oct 07 01:10:46 2009 -0700" }, "message": "net: mark net_proto_ops as const\n\nAll usages of structure net_proto_ops should be declared const.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7058842c940ad2c08dd829b21e5c92ebe3b8758", "tree": "5fe78d599fc345ca0bcd4b083b79095a54b2921b", "parents": [ "eb1cf0f8f7a9e5a6d573d5bd72c015686a042db0" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 30 16:12:20 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 30 16:12:20 2009 -0700" }, "message": "net: Make setsockopt() optlen be unsigned.\n\nThis provides safety against negative optlen at the type\nlevel instead of depending upon (sometimes non-trivial)\nchecks against this sprinkled all over the the place, in\neach and every implementation.\n\nBased upon work done by Arjan van de Ven and feedback\nfrom Linus Torvalds.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "137742cf9738f1b4784058ff79aec7ca85e769d4", "tree": "1b2424c5d0efe674c8a93f09451b281f0ada3ec6", "parents": [ "81538e74ca12a71ea37ce72f809ebc65a90b9538" ], "author": { "name": "Karl Hiramoto", "email": "karl@hiramoto.org", "time": "Wed Sep 02 23:26:39 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 02 23:46:10 2009 -0700" }, "message": "atm/br2684: netif_stop_queue() when atm device busy and netif_wake_queue() when we can send packets again.\n\nThis patch removes the call to dev_kfree_skb() when the atm device is busy.\nCalling dev_kfree_skb() causes heavy packet loss then the device is under\nheavy load, the more correct behavior should be to stop the upper layers,\nthen when the lower device can queue packets again wake the upper layers.\n\nSigned-off-by: Karl Hiramoto \u003ckarl@hiramoto.org\u003e\nSigned-off-by: Chas Williams \u003cchas@cmf.nrl.navy.mil\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "89d69d2b75a8f7e258f4b634cd985374cfd3202e", "tree": "2f01d6ae1844c92ef09160ad1966edee34ee2d8a", "parents": [ "dcbfef820bdd1cdb412ccf234840e23edf67014f" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Tue Sep 01 11:13:19 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 17:40:57 2009 -0700" }, "message": "net: make neigh_ops constant\n\nThese tables are never modified at runtime. Move to read-only\nsection.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3c805a22a3a178fc5aaadd518afa5358b78bf69e", "tree": "fe93630007876b4aaddb2fa8d92141df2f74e24c", "parents": [ "6fef4c0c8eeff7de13007a5f56113475444a253d" ], "author": { "name": "Stephen Hemminger", "email": "shemminger@vyatta.com", "time": "Mon Aug 31 19:50:42 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Sep 01 01:13:10 2009 -0700" }, "message": "convert ATM drivers to netdev_tx_t\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "36cbd3dcc10384f813ec0814255f576c84f2bcd4", "tree": "c3579edea972519d2f9ae99d7da9a5dd56e6f5c1", "parents": [ "db71789c01ae7b641f83c5aa64e7df25122f4b28" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Wed Aug 05 10:42:58 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 05 10:42:58 2009 -0700" }, "message": "net: mark read-only arrays as const\n\nString literals are constant, and usually, we can also tag the array\nof pointers const too, moving it to the .rodata section.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5a8a896f5180f2950695d2d0b79db348d200ca4", "tree": "04adc57ae51a6d30a89ffae970770b81ee81fc23", "parents": [ "bff38771e1065c7fc3de87e47ba366151eea573c", "e594e96e8a14101a6decabf6746bd5186287debc" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 09 20:18:24 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jul 09 20:18:24 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n" } ], "next": "a57de0b4336e48db2811a2030bb68dba8dd09d88" }