)]}'
{
  "log": [
    {
      "commit": "e46754f8c9333170f11780d8e3a70da1b1a88338",
      "tree": "9b7ac1c7cb4c147c69767908c6dcb7633fb03f12",
      "parents": [
        "ef9e83c1ab2981769f16e626179dd56895041b38",
        "fe6f212ce12341df18ef9b890bea739b4547157b"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Apr 20 17:57:56 2010 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Apr 20 17:57:56 2010 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n"
    },
    {
      "commit": "fe6f212ce12341df18ef9b890bea739b4547157b",
      "tree": "a8ac4d32c86d590b28e39866b1533d4a1b4ac1ba",
      "parents": [
        "b4bb5c3fd9333024044362df67e23e96158489ed"
      ],
      "author": {
        "name": "Reinette Chatre",
        "email": "reinette.chatre@intel.com",
        "time": "Mon Apr 19 10:46:31 2010 -0700"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Apr 19 16:34:11 2010 -0400"
      },
      "message": "mac80211: pass HT changes to driver when off channel\n\nSince \"mac80211: make off-channel work generic\" drivers have not been\nnotified of configuration changes after association or authentication. This\ncaused more dependence on current state to ensure driver will be notified\nwhen configuration changes occur. One such problem arises if off-channel is\nin progress when HT information changes. Since HT is only enabled on the\n\"oper_channel\" the driver will never be notified of this change. Usually\nthe driver is notified soon after of a BSS information change\n(BSS_CHANGED_HT) ... but since the driver did not get a notification that\nthis is a HT channel the new BSS information does not make sense.\n\nFix this by also changing the off-channel information when HT is enabled\nand thus cause driver to be notified correctly.\n\nThis fixes a problem in 4965 when associated with 5GHz 40MHz channel.\nWithout this patch the system can associate but is unable to transfer any\ndata, not even ping.\n\nSee http://bugzilla.intellinuxwireless.org/show_bug.cgi?id\u003d2158\n\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "b4bb5c3fd9333024044362df67e23e96158489ed",
      "tree": "180405311d50e63ac6f6dd67eefefeb2c2c110bc",
      "parents": [
        "f2fa1b015e9c199e45c836c769d94db595150731"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Mon Apr 19 10:48:38 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Apr 19 16:34:11 2010 -0400"
      },
      "message": "mac80211: remove bogus TX agg state assignment\n\nWhen the addba timer expires but has no work to do,\nit should not affect the state machine. If it does,\nTX will not see the successfully established and we\ncan also crash trying to re-establish the session.\n\nCc: stable@kernel.org [2.6.32, 2.6.33]\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "4a1032faac94ebbf647460ae3e06fc21146eb280",
      "tree": "7f31b97beb0406faa1523e619289ad0ab07c9787",
      "parents": [
        "ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06",
        "0eddb519b9127c73d53db4bf3ec1d45b13f844d1"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Apr 11 02:44:30 2010 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Apr 11 02:44:30 2010 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n"
    },
    {
      "commit": "005c93b5d876edf670b4c71d8dd79dc4e845a099",
      "tree": "5ee50d6174e3ed9f4fec8fec9ca53e780b874a23",
      "parents": [
        "fb9e2d887243499b8d28efcf80821c4f6a092395",
        "1144601118507f8b3b676a9a392584d216d3f2cc"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Apr 07 16:41:03 2010 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Apr 07 16:41:03 2010 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n"
    },
    {
      "commit": "0379185b6c0d1e8252023698cf1091da92a3dc03",
      "tree": "f4dfe150ef44b2b94d94c982f8bddf9c44c4294d",
      "parents": [
        "1cb561f83793191cf86a2db3948d28f5f42df9ff"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Tue Apr 06 11:18:42 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Apr 06 15:53:30 2010 -0400"
      },
      "message": "mac80211: annotate station rcu dereferences\n\nThe new RCU lockdep support warns about these\nin some contexts -- make it aware of the locks\nused to protect all this. Different locks are\nused in different contexts which unfortunately\nmeans we can\u0027t get perfect checking.\n\nAlso remove rcu_dereference() from two places\nthat don\u0027t actually dereference the pointers.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "1cb561f83793191cf86a2db3948d28f5f42df9ff",
      "tree": "f1d8109a0ed6595e1fb6ef3e5b14b8194deb5215",
      "parents": [
        "de0f60ea94e132c858caa64a44b2012e1e8580b0"
      ],
      "author": {
        "name": "Javier Cardona",
        "email": "javier@cozybit.com",
        "time": "Mon Mar 29 11:00:20 2010 -0700"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Apr 06 15:53:28 2010 -0400"
      },
      "message": "mac80211: Handle mesh action frames in ieee80211_rx_h_action\n\nThis fixes the problem introduced in commit\n8404080568613d93ad7cf0a16dfb68 which broke mesh peer link establishment.\n\nchanges:\nv2 \tAdded missing break (Johannes)\nv3 \tBroke original patch into two (Johannes)\n\nSigned-off-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nCc: stable@kernel.org\nReviewed-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "cb4361c1dc29cd870f664c004b1817106fbce0fa",
      "tree": "c31533210d738c9074b21b8f31fe0399b39545f0",
      "parents": [
        "309361e09ca9e9670dc8664e5d14125bf82078af",
        "fb9e2d887243499b8d28efcf80821c4f6a092395"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Tue Apr 06 08:34:06 2010 -0700"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Tue Apr 06 08:34:06 2010 -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: (37 commits)\n  smc91c92_cs: fix the problem of \"Unable to find hardware address\"\n  r8169: clean up my printk uglyness\n  net: Hook up cxgb4 to Kconfig and Makefile\n  cxgb4: Add main driver file and driver Makefile\n  cxgb4: Add remaining driver headers and L2T management\n  cxgb4: Add packet queues and packet DMA code\n  cxgb4: Add HW and FW support code\n  cxgb4: Add register, message, and FW definitions\n  netlabel: Fix several rcu_dereference() calls used without RCU read locks\n  bonding: fix potential deadlock in bond_uninit()\n  net: check the length of the socket address passed to connect(2)\n  stmmac: add documentation for the driver.\n  stmmac: fix kconfig for crc32 build error\n  be2net: fix bug in vlan rx path for big endian architecture\n  be2net: fix flashing on big endian architectures\n  be2net: fix a bug in flashing the redboot section\n  bonding: bond_xmit_roundrobin() fix\n  drivers/net: Add missing unlock\n  net: gianfar - align BD ring size console messages\n  net: gianfar - initialize per-queue statistics\n  ...\n"
    },
    {
      "commit": "d5dc056cce9e60528d5eac64efed623d26ffe46f",
      "tree": "b5124013d0935be211fd1df702db2f69c581c5ab",
      "parents": [
        "00ae702847df5566ce9182e9c895185e2ad1c181",
        "7371400431389e1df6a2a05ab9882055b8a6ff2c"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 31 19:32:50 2010 -0700"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Mar 31 19:32:50 2010 -0700"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n"
    },
    {
      "commit": "7236fe29fd72d17074574ba312e7f1bb9d10abaa",
      "tree": "6afd1fed2871daca52f5a8b3070337ae1b6ada0d",
      "parents": [
        "05a9a1617026977422c7c5ed3aeac6f46fa2132c"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes.berg@intel.com",
        "time": "Mon Mar 22 13:42:43 2010 -0700"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Mar 30 15:37:28 2010 -0400"
      },
      "message": "mac80211: move netdev queue enabling to correct spot\n\n\"mac80211: fix skb buffering issue\" still left a race\nbetween enabling the hardware queues and the virtual\ninterface queues. In hindsight it\u0027s totally obvious\nthat enabling the netdev queues for a hardware queue\nwhen the hardware queue is enabled is wrong, because\nit could well possible that we can fill the hw queue\nwith packets we already have pending. Thus, we must\nonly enable the netdev queues once all the pending\npackets have been processed and sent off to the device.\n\nIn testing, I haven\u0027t been able to trigger this race\ncondition, but it\u0027s clearly there, possibly only when\naggregation is being enabled.\n\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "533866b12cce484994163b1e201778cbac4c04c5",
      "tree": "6623b75a54f72e53da78fc2982b8486d62346aae",
      "parents": [
        "c7a00dc73b7185ab2ebd1aa7ce710c7b4edc77a4"
      ],
      "author": {
        "name": "Porsch, Marco",
        "email": "marco.porsch@siemens.com",
        "time": "Wed Feb 24 09:53:13 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Mar 30 15:37:23 2010 -0400"
      },
      "message": "mac80211: fix PREQ processing and one small bug\n\n1st) a PREQ should only be processed, if it has the same SN and better\nmetric (instead of better or equal).\n2nd) next_hop[ETH_ALEN] now actually used to buffer\nmpath-\u003enext_hop-\u003esta.addr for use out of lock.\n\nSigned-off-by: Marco Porsch \u003cmarco.porsch@siemens.com\u003e\nAcked-by: Javier Cardona \u003cjavier@cozybit.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "c7a00dc73b7185ab2ebd1aa7ce710c7b4edc77a4",
      "tree": "9eadd919277988355b44c2a63e9d027fe81cfd2a",
      "parents": [
        "368d06f5b0eefcbf37d677d3b65381310a251f03"
      ],
      "author": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 17 11:28:18 2010 -0400"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Mar 30 15:37:22 2010 -0400"
      },
      "message": "mac80211: correct typos in \"unavailable upon resume\" warning\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\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": "d89b218b801fd93ea95880f1c7fde348cbcc51c5",
      "tree": "cd3c34e1811f9b2bc10ecfb957bf26cbd04c677e",
      "parents": [
        "80a186074e72e2cd61f6716d90cf32ce54981a56",
        "bec68ff1637ca00bb1585a03a7be8a13380084de"
      ],
      "author": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Sat Mar 13 14:50:18 2010 -0800"
      },
      "committer": {
        "name": "Linus Torvalds",
        "email": "torvalds@linux-foundation.org",
        "time": "Sat Mar 13 14:50:18 2010 -0800"
      },
      "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: (108 commits)\n  bridge: ensure to unlock in error path in br_multicast_query().\n  drivers/net/tulip/eeprom.c: fix bogus \"(null)\" in tulip init messages\n  sky2: Avoid rtnl_unlock without rtnl_lock\n  ipv6: Send netlink notification when DAD fails\n  drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant\n  ipconfig: Handle devices which take some time to come up.\n  mac80211: Fix memory leak in ieee80211_if_write()\n  mac80211: Fix (dynamic) power save entry\n  ipw2200: use kmalloc for large local variables\n  ath5k: read eeprom IQ calibration values correctly for G mode\n  ath5k: fix I/Q calibration (for real)\n  ath5k: fix TSF reset\n  ath5k: use fixed antenna for tx descriptors\n  libipw: split ieee-\u003enetworks into small pieces\n  mac80211: Fix sta_mtx unlocking on insert STA failure path\n  rt2x00: remove KSEG1ADDR define from rt2x00soc.h\n  net: add ColdFire support to the smc91x driver\n  asix: fix setting mac address for AX88772\n  ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}.\n  net: Fix dev_mc_add()\n  ...\n"
    },
    {
      "commit": "51f5f8ca446d4c59041b9b6995821e13208897ea",
      "tree": "871e000936610452e975788cce836e7253b477e3",
      "parents": [
        "2a13052fe495948e572839e514e0e0cd236c50b0"
      ],
      "author": {
        "name": "Eric Dumazet",
        "email": "eric.dumazet@gmail.com",
        "time": "Wed Mar 10 17:13:36 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 10 16:29:11 2010 -0500"
      },
      "message": "mac80211: Fix memory leak in ieee80211_if_write()\n\nFix memory leak and use kmalloc() instead of kzalloc() as we are going\nto overwrite the allocated buffer.\n\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "2a13052fe495948e572839e514e0e0cd236c50b0",
      "tree": "7a15b095d5dc57fb21ea789439851205e2865349",
      "parents": [
        "41093167ec6c1854903a4bc38a37b5740c028984"
      ],
      "author": {
        "name": "Juuso Oikarinen",
        "email": "juuso.oikarinen@nokia.com",
        "time": "Tue Mar 09 14:25:02 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 10 16:29:10 2010 -0500"
      },
      "message": "mac80211: Fix (dynamic) power save entry\n\nCurrently hardware with !IEEE80211_HW_PS_NULLFUNC_STACK and\nIEEE80211_HW_REPORTS_TX_ACK_STATUS will never enter PSM due to the\nconditions in the power save entry functions.\n\nFix those conditions.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "38a679a52be13d5a0c766597ab823e06688d6e8e",
      "tree": "56e6e769ff0dd38264bbb1462562761824701925",
      "parents": [
        "e5a9a35cb9c0d92d7c986cb3696fb794be100087"
      ],
      "author": {
        "name": "Jouni Malinen",
        "email": "j@w1.fi",
        "time": "Sat Mar 06 18:35:08 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 10 16:16:54 2010 -0500"
      },
      "message": "mac80211: Fix sta_mtx unlocking on insert STA failure path\n\nCommit 34e895075e21be3e21e71d6317440d1ee7969ad0 introduced sta_mtx\nlocking into sta_info_insert() (now sta_info_insert_rcu), but forgot\nto unlock this mutex on one of the error paths. Fix this by adding\nthe missing mutex_unlock() call for the case where STA insert fails\ndue to an entry existing already. This may happen at least in AP mode\nwhen a STA roams between two BSSes (vifs).\n\nSigned-off-by: Jouni Malinen \u003cj@w1.fi\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858",
      "tree": "ce595adde342f57f379d277b25e4dd206988a052",
      "parents": [
        "25cf84cf377c0aae5dbcf937ea89bc7893db5176",
        "3e58974027b04e84f68b964ef368a6cd758e2f84"
      ],
      "author": {
        "name": "Jiri Kosina",
        "email": "jkosina@suse.cz",
        "time": "Mon Mar 08 16:55:37 2010 +0100"
      },
      "committer": {
        "name": "Jiri Kosina",
        "email": "jkosina@suse.cz",
        "time": "Mon Mar 08 16:55:37 2010 +0100"
      },
      "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n"
    },
    {
      "commit": "4fa004373133ece3d9b1c0a7e243b0e53760b165",
      "tree": "e70b44c3d6a5afef0238caff3c7eefbcc74b0bc0",
      "parents": [
        "b08dfd0435333818a03b38867c556ebcbb3abc02"
      ],
      "author": {
        "name": "Sujith",
        "email": "Sujith.Manoharan@atheros.com",
        "time": "Mon Mar 01 14:42:57 2010 +0530"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Mar 03 15:39:21 2010 -0500"
      },
      "message": "mac80211: Fix HT rate control configuration\n\nHandling HT configuration changes involved setting the channel\nwith the new HT parameters and then issuing a rate_update()\nnotification to the driver.\n\nThis behavior changed after the off-channel changes. Now, the channel\nis not updated with the new HT params in enable_ht() - instead, it\nis now done when the scan work terminates. This results in the driver\ndepending on stale information, defaulting to non-HT mode always.\n\nFix this by passing the new channel type to the driver.\n\nCc: stable@kernel.org\nSigned-off-by: Sujith \u003cSujith.Manoharan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "9c87ba6734422034fccb938da1039ed63da1395c",
      "tree": "998b679ddfe7ab2f104808a7f3627a4b4ccf23d7",
      "parents": [
        "a9f042cbe5284f34ccff15f3084477e11b39b17b"
      ],
      "author": {
        "name": "Jouni Malinen",
        "email": "j@w1.fi",
        "time": "Sun Feb 28 12:13:46 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Mar 02 14:28:50 2010 -0500"
      },
      "message": "mac80211: Fix reassociation processing (within ESS roaming)\n\nCommit e1dd33f60ced091114e4aacf141e0d03b88d3e13 changed cfg80211 to\nallow association commands while in associated state to enable support\nfor roaming within an ESS. However, this was not enough to resolve all\ncases with mac80211 which needs some additional handling of the\nreassociation case to clear internal state with the BSS that was in use\npreviously.\n\nThis patch makes ieee80211_mgd_assoc() accept a valid reassociation\ncommand and clean the association state with the previous BSS. This\nfixes roaming between BSSes in an ESS when using wpa_supplicant with\n-Dnl80211.\n\nSigned-off-by: Jouni Malinen \u003cj@w1.fi\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "ce300c7ffa61165f9bfd16e511ee0cd4114977ab",
      "tree": "874b57409bad0c9620a431272e6bf5c94e270253",
      "parents": [
        "8266d7127c1b0bdf924066c19c71be4d351e9583",
        "9e3bd9190800e8209b4a3e1d724c35f0738dcad2"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Feb 27 02:05:54 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Feb 27 02:05:54 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n"
    },
    {
      "commit": "0e0a228398cc967c922759be36c69d32e4f62701",
      "tree": "20ecd4b6d2387935aebc9ea54c1c0e41005d74bd",
      "parents": [
        "caf66e581172dc5032bb84841a91bc7b77ad9876"
      ],
      "author": {
        "name": "Juuso Oikarinen",
        "email": "juuso.oikarinen@nokia.com",
        "time": "Fri Feb 26 08:13:41 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Feb 26 16:59:12 2010 -0500"
      },
      "message": "mac80211: fix direct probe loop on ieee80211_work_purge\n\nIf authentication has already been performed when the WLAN interface is\nstopped, (sometimes) the ieee80211_work_purge would corrupt some\nieee80211_work-structures. The outcome is this (cleaned up):\n\n[ 2252.398681] WARNING: at net/mac80211/work.c:995 ieee80211_work_purge\n[ 2252.466430] Backtrace:\n[ 2252.529266] (ieee80211_work_purge+0x0/0xcc [mac80211])\n[ 2252.546875] (ieee80211_stop+0x0/0x4c0 [mac80211])\n\nAdditionally, one would get this, going on regarless of the WLAN interface\nstate, going on forever:\n\n[ 2252.859985] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717525)\n[ 2253.055419] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717524)\n[ 2253.250610] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717523)\n[ 2253.446014] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717522)\n[ 2253.641357] wlan0: direct probe to 00:90:4c:60:04:00 (try -996717521)\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nReviewed-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "b446918b77c717a34eaa853dfab55f579d330551",
      "tree": "1dfe5175f3acd06bcf2ef16ee346a4931a563611",
      "parents": [
        "7bfbae10dc10a5c94a780d117a57e875d77e8e5a"
      ],
      "author": {
        "name": "Helmut Schaa",
        "email": "helmut.schaa@googlemail.com",
        "time": "Wed Feb 24 14:19:37 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Feb 26 16:59:11 2010 -0500"
      },
      "message": "mac80211: use listen interval 5 as default\n\nCurrently if a driver does not set hw.max_listen_interval a listen\ninterval of 1 is negotiated with the AP. Thus, the AP could drop\nbuffered frames for us after just one beacon interval which can\neasily happen with the current powersave and scan implementation.\nTo avoid this issue increase the default interval to 5 which should\nbe a reasonable safe default.\n\nSigned-off-by: Helmut Schaa \u003chelmut.schaa@googlemail.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "64463da913bc8f791980ba28d93ac5e716ab9cc5",
      "tree": "cf958678f7cf0b615a52356beb2d18240424ab4a",
      "parents": [
        "4a6967b88af02eebeedfbb91bc09160750225bb5",
        "a120e912eb51e347f36c71b60a1d13af74d30e83"
      ],
      "author": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Feb 26 16:54:45 2010 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Feb 26 16:54:45 2010 -0500"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-core.h\n\tnet/mac80211/rate.c\n"
    },
    {
      "commit": "19bc291c99f018bd4f2c38bbf69144086dca903f",
      "tree": "9d3cf9bc0c5a78e363dc0547da8bcd1e7c394265",
      "parents": [
        "04488734806948624dabc4514f96f14cd75b9a50",
        "4a6967b88af02eebeedfbb91bc09160750225bb5"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Feb 25 23:26:21 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Feb 25 23:26:21 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-core.h\n\tdrivers/net/wireless/rt2x00/rt2800pci.c\n"
    },
    {
      "commit": "bef5d1c70d132145c0fc75b3586a19841a9a82e4",
      "tree": "07f657821d0e903d3caea59378d73a903a1237f2",
      "parents": [
        "04662360854aefcb6337d93701892ad97411fdd0"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Tue Feb 16 11:05:00 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Feb 16 14:16:24 2010 -0500"
      },
      "message": "mac80211: split ieee80211_drop_unencrypted\n\nCurrently, ieee80211_drop_unencrypted is called\nfrom management and data frame context, and the\ndifferent contexts pass different frames. This\ncould lead to it processing an 802.3 frame as an\n802.11 frame when MFP is enabled.\n\nMove the MFP part of ieee80211_drop_unencrypted\ninto a new function that is only called for mgmt\nframes.\n\nCc: Jouni Malinen \u003cj@w1.fi\u003e\nSigned-off-by: Johannes Berg \u003cjohannes.berg@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "026331c4d9b526561ea96f95fac4bfc52b69e316",
      "tree": "a82b0a92a7f03a1d151a9db123320689c73d98c7",
      "parents": [
        "8404080568613d93ad7cf0a16dfb68459b42a264"
      ],
      "author": {
        "name": "Jouni Malinen",
        "email": "jouni.malinen@atheros.com",
        "time": "Mon Feb 15 12:53:10 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 15 16:14:15 2010 -0500"
      },
      "message": "cfg80211/mac80211: allow registering for and sending action frames\n\nThis implements a new command to register for action frames\nthat userspace wants to handle instead of the in-kernel\nrejection. It is then responsible for rejecting ones that\nit decided not to handle. There is no unregistration, but\nthe socket can be closed for that.\n\nFrames that are not registered for will not be forwarded\nto userspace and will be rejected by the kernel, the\ncfg80211 API helps implementing that.\n\nAdditionally, this patch adds a new command that allows\ndoing action frame transmission from userspace. It can be\nused either to exchange action frames on the current\noperational channel (e.g., with the AP with which we are\ncurrently associated) or to exchange off-channel Public\nAction frames with the remain-on-channel command.\n\nSigned-off-by: Jouni Malinen \u003cjouni.malinen@atheros.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "8404080568613d93ad7cf0a16dfb68459b42a264",
      "tree": "f09409846d4d2a81f750618082ea65c34854bcd9",
      "parents": [
        "de1ebdceb6a4fe1b7073b81d273285b7c8bed312"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Mon Feb 15 12:46:39 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 15 16:14:13 2010 -0500"
      },
      "message": "mac80211: reject unhandled action frames\n\n802.11-2007 7.3.1.11 mandates that we need to\nreject action frames we don\u0027t handle by setting\nthe 0x80 bit in the category and returning them\nto the sender, so do that. In AP mode, hostapd\nis responsible for this.\n\nAdditionally, drop completely malformed action\nframes or ones that should\u0027ve been encrypted as\nunusable, userspace shouldn\u0027t see those.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: Jouni Malinen \u003cjouni.malinen@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "2f5265e6e785b2a666dd985ea157bc8c260be8fa",
      "tree": "ce12947c600cc0e6de2cf0cab57cb518b09b907c",
      "parents": [
        "f318d658decb5789cfbb43041daf3dc3aade1df0"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Fri Feb 12 10:45:05 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 15 16:12:52 2010 -0500"
      },
      "message": "mac80211: fix netdev rename\n\nFix a copy bug introduced by\n\n    commit 47846c9b0c10808d9337d2e7d09361f3e0a0a71a\n    Author: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\n    Date:   Wed Nov 25 17:46:19 2009 +0100\n\n        mac80211: reduce reliance on netdev\n\nThis manifested itself only in debug messages\nand in the debugfs rename failure that would\nalways happen due to trying to rename the dir\nover itself.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nTested-by: Pavel Roskin \u003cproski@gnu.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "228da6c2e63b3b2064492b24ef83c07bcc48abbd",
      "tree": "bdde21453c29ebd613eae2a3e41bdb9bede1110d",
      "parents": [
        "5659338c88963ea791118e5e11e314b24f90c3eb"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Feb 14 22:49:52 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Feb 14 22:49:52 2010 -0800"
      },
      "message": "mac80211: Fix error introduced in netdev_mc_count() changes.\n\nCommit 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5\n(\"net: use netdev_mc_count and netdev_mc_empty when appropriate\")\nadded this hunk to net/mac80211/iface.c:\n\n \t__dev_addr_unsync(\u0026local-\u003emc_list, \u0026local-\u003emc_count,\n-\t\t\t  \u0026dev-\u003emc_list, \u0026dev-\u003emc_count);\n+\t\t\t  \u0026dev-\u003emc_list, dev-\u003emc_count);\n\nwhich is definitely not correct, introduced a warning (reported\nby Stephen Rothwell):\n\nnet/mac80211/iface.c: In function \u0027ieee80211_stop\u0027:\nnet/mac80211/iface.c:416: warning: passing argument 4 of \u0027__dev_addr_unsync\u0027 makes pointer from integer without a cast\ninclude/linux/netdevice.h:1967: note: expected \u0027int *\u0027 but argument is of type \u0027int\u0027\n\nand is thus reverted here.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "5ecccb74dc91e22496a142b103ba958f93c29275",
      "tree": "b560b8974ec0e0478492d60753d45d8aea9db9b0",
      "parents": [
        "f6f223039c0d0683bdea1eabd35b309e10311a60",
        "3d0beb921fa34ebf8b13e206e5473329b14deb83"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Feb 14 22:30:54 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Feb 14 22:30:54 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tnet/mac80211/rate.c\n"
    },
    {
      "commit": "f6f223039c0d0683bdea1eabd35b309e10311a60",
      "tree": "890e07acf8c18ddc2994ebc0a0bdcdda38b0dcc6",
      "parents": [
        "b3b3f04fb587ecb61b5baa6c1c5f0e666fd12d73",
        "42c4568a4ace0adc27a9d6f02936e2047ba6fc7e"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Feb 14 17:45:59 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Feb 14 17:45:59 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n"
    },
    {
      "commit": "3d0beb921fa34ebf8b13e206e5473329b14deb83",
      "tree": "b7f121166e835da5e61587ce7bd18b4091b1b7be",
      "parents": [
        "5e2a911cecc7e0fd89b1d2d001b7b89d47057ad6",
        "5affcd6ba2036b59a4dee3f0576ae3584e92e4f1"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Feb 14 11:56:38 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sun Feb 14 11:56:38 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n"
    },
    {
      "commit": "5affcd6ba2036b59a4dee3f0576ae3584e92e4f1",
      "tree": "78c6d3a329968b253d5c67c7d11adc0ab9af3c3d",
      "parents": [
        "fafaf31bf9f965d91462ee115e27ef6c262b74ea"
      ],
      "author": {
        "name": "Juuso Oikarinen",
        "email": "juuso.oikarinen@nokia.com",
        "time": "Fri Feb 12 10:05:45 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Feb 12 14:50:22 2010 -0500"
      },
      "message": "mac80211: fix handling of null-rate control in rate_control_get_rate\n\nFor hardware with IEEE80211_HW_HAS_RATE_CONTROL the rate controller is not\ninitialized. However, calling functions such as ieee80211_beacon_get result\nin the rate_control_get_rate function getting called, which is accessing\n(in this case uninitialized) rate control structures unconditionally.\n\nFix by exiting the function before setting the rates for HW with\nIEEE80211_HW_HAS_RATE_CONTROL set. The initialization of the ieee80211_tx_info\nstruct is intentionally still executed.\n\nSigned-off-by: Juuso Oikarinen \u003cjuuso.oikarinen@nokia.com\u003e\nReviewed-by: Kalle Valo \u003ckalle.valo@nokia.com\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5",
      "tree": "99f57f6374a58022e1e5ed1cbc12699288c7eae1",
      "parents": [
        "8e5574211d96c0552f84c757718475fdb4021be7"
      ],
      "author": {
        "name": "Jiri Pirko",
        "email": "jpirko@redhat.com",
        "time": "Mon Feb 08 04:30:35 2010 +0000"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Fri Feb 12 11:38:58 2010 -0800"
      },
      "message": "net: use netdev_mc_count and netdev_mc_empty when appropriate\n\nThis patch replaces dev-\u003emc_count in all drivers (hopefully I didn\u0027t miss\nanything). Used spatch and did small tweaks and conding style changes when\nit was suitable.\n\nJirka\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n"
    },
    {
      "commit": "4cad6c7c38930618d77e65af82c1403d63879eee",
      "tree": "9e8c14e0819c42c8ac290f6a0bba5ca45a3ecef2",
      "parents": [
        "f32338319f10c4ca5499c19edc5b3618896920ba"
      ],
      "author": {
        "name": "Sujith",
        "email": "Sujith.Manoharan@atheros.com",
        "time": "Wed Feb 10 14:52:21 2010 +0530"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Wed Feb 10 16:36:52 2010 -0500"
      },
      "message": "mac80211: Deny TX BA session requests during disassociation\n\nIn associated state, when bringing an interface down, existing\nBA sessions are torn down. When this is in progress, nothing\nprevents mac80211 from accepting another BA session start request.\n\nUse a new station flag to fix this.\n\nSigned-off-by: Sujith \u003cSujith.Manoharan@atheros.com\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "044c18c9f51a2b92b310e28bb121e55451b088dd",
      "tree": "b57fb7cd9dc33412d6811b734664e90be26418c7",
      "parents": [
        "3f2e8d9f13246382fbda6f03178eef867a9bfbe2",
        "174b24963eaf96dc5e093502ee09639aed13eb2f"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 10 12:35:24 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Wed Feb 10 12:35:24 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n"
    },
    {
      "commit": "375177bf35efc08e1bd37bbda4cc0c8cc4db8500",
      "tree": "88774b1a46072fd3b0418b36d39d447b78fbfc51",
      "parents": [
        "e15276a4b220c54db665cf46a92bd9ceb9aeb052"
      ],
      "author": {
        "name": "Vivek Natarajan",
        "email": "vnatarajan@atheros.com",
        "time": "Tue Feb 09 14:50:28 2010 +0530"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Feb 09 14:10:05 2010 -0500"
      },
      "message": "mac80211: Retry null data frame for power save.\n\nEven if the null data frame is not acked by the AP, mac80211\ngoes into power save. This might lead to loss of frames\nfrom the AP.\nPrevent this by restarting dynamic_ps_timer when ack is not\nreceived for null data frames.\n\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: Vivek Natarajan \u003cvnatarajan@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "3ad2f3fbb961429d2aa627465ae4829758bc7e07",
      "tree": "f365c513e8f5b477a61336a600ff54f32b7ad6e1",
      "parents": [
        "1537a3638cbf741d3826c1002026cce487a6bee0"
      ],
      "author": {
        "name": "Daniel Mack",
        "email": "daniel@caiaq.de",
        "time": "Wed Feb 03 08:01:28 2010 +0800"
      },
      "committer": {
        "name": "Jiri Kosina",
        "email": "jkosina@suse.cz",
        "time": "Tue Feb 09 11:13:56 2010 +0100"
      },
      "message": "tree-wide: Assorted spelling fixes\n\nIn particular, several occurances of funny versions of \u0027success\u0027,\n\u0027unknown\u0027, \u0027therefore\u0027, \u0027acknowledge\u0027, \u0027argument\u0027, \u0027achieve\u0027, \u0027address\u0027,\n\u0027beginning\u0027, \u0027desirable\u0027, \u0027separate\u0027 and \u0027necessary\u0027 are fixed.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Junio C Hamano \u003cgitster@pobox.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n"
    },
    {
      "commit": "e15276a4b220c54db665cf46a92bd9ceb9aeb052",
      "tree": "084ec601adeb65532f6c3a6b52cf1dc728065235",
      "parents": [
        "209c671db7a917740ab9873d442b10ae7e369937"
      ],
      "author": {
        "name": "Vivek Natarajan",
        "email": "vnatarajan@atheros.com",
        "time": "Mon Feb 08 17:47:01 2010 +0530"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:51:03 2010 -0500"
      },
      "message": "mac80211: Reset dynamic ps timer in Rx path.\n\nThe current mac80211 implementation enables power save if there\nis no Tx traffic for a specific timeout. Hence, PS is triggered\neven if there is a continuous Rx only traffic(like UDP) going on.\nThis makes the drivers to wait on the tim bit in the next beacon\nto awake which leads to redundant sleep-wake cycles.\nFix this by restarting the dynamic ps timer on receiving every\ndata packet.\n\nSigned-off-by: Vivek Natarajan \u003cvnatarajan@atheros.com\u003e\nCC: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "209c671db7a917740ab9873d442b10ae7e369937",
      "tree": "5bdad7889666b679e5dd67adf59a5e3223d0d266",
      "parents": [
        "641eabb0a3717020d1a93d3f91493ab0d826c910"
      ],
      "author": {
        "name": "Andres Salomon",
        "email": "dilinger@collabora.co.uk",
        "time": "Sun Feb 07 21:47:50 2010 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:51:03 2010 -0500"
      },
      "message": "mac80211: make rate_control_alloc static\n\nrate_control_alloc is not used by anything outside of\nieee80211_init_rate_ctrl_alg.  Both are in rate.c; there\u0027s no reason to make\nrate_control_alloc visible outside of it.\n\nSigned-off-by: Andres Salomon \u003cdilinger@collabora.co.uk\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "349e6b7289f8a3d3d5d3b859e00b41f27d1211df",
      "tree": "d80af4e7b9ece2b42e8093f44bfedd13d9653bd5",
      "parents": [
        "00a08eb62f790383bcc8ea309d4afb9ef346ef0b"
      ],
      "author": {
        "name": "Kalle Valo",
        "email": "kalle.valo@iki.fi",
        "time": "Sun Feb 07 10:22:01 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:51:01 2010 -0500"
      },
      "message": "mac80211: remove get_tx_stats() driver op\n\nget_tx_stats() driver operation is not currently used anywhere in mac80211\nand there are no plans to use it in the not-so-near future. So it can go\nwithout anyone missing it.\n\nSigned-off-by: Kalle Valo \u003ckalle.valo@iki.fi\u003e\nAcked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "29165e4c8b265a415f1fd1dca947b5d4c72abc47",
      "tree": "c10e69c0cafa08c75c2f8ded623c2d66a15b6953",
      "parents": [
        "21b2d8bd2f0d4e0f21ade147fd193c8b9c1fd2b9"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Sat Feb 06 15:20:13 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:50:59 2010 -0500"
      },
      "message": "mac80211: fix deauth race\n\nWhen userspace requests a deauth while the\nauthentication work is pending in the auth\n(not probe) state, we do not properly abort\nthe work and then things get confused.\n\nFix that and also improve the checks here\nto include the correct virtual interface,\njust in case two virtual interfaces would\never try to connect to the same BSS.\n\nAlso fix a bug -- need to use list_del_rcu\ninstead of just list_del to free a work\nitem.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "19885c4fbd79439efd6b3798bfb73f2f30e27104",
      "tree": "ee15587e44a35885d7b77a698bc07dd0263fec62",
      "parents": [
        "199d69f27326858b16449eb1cc1623299db64415"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Fri Feb 05 11:45:06 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:50:57 2010 -0500"
      },
      "message": "mac80211: fix bss_conf.dtim_period\n\nIn AP mode, the only mode where the parameter\nis supposed to be valid, we never assign it!\nFix that to allow drivers to avoid parsing\nthe TIM IE for the value.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "199d69f27326858b16449eb1cc1623299db64415",
      "tree": "3bfa43e22a63518ba3fd2eef2885c58404257e7f",
      "parents": [
        "40e6fa829a2544c9f8fd5a94844fe502334d6afc"
      ],
      "author": {
        "name": "Benoit Papillault",
        "email": "benoit.papillault@free.fr",
        "time": "Thu Feb 04 22:00:20 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:50:57 2010 -0500"
      },
      "message": "mac80211: Added a new debugfs file for reading channel_type\n\nThis file helps debugging HT channels since it displays if we are on\nht20 or ht40+/ht40-\n\nSigned-off-by: Benoit Papillault \u003cbenoit.papillault@free.fr\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "74e2bd1fa3ae9695af566ad5a7a288898787b909",
      "tree": "25b0c76fb983cef091fe3a02fe27ab2891b0efb8",
      "parents": [
        "3f7c5c10e9dc6bf90179eb9f7c06151d508fb324"
      ],
      "author": {
        "name": "Wey-Yi Guy",
        "email": "wey-yi.w.guy@intel.com",
        "time": "Wed Feb 03 09:28:55 2010 -0800"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:50:54 2010 -0500"
      },
      "message": "mac80211: tear down all agg queues when restart/reconfig hw\n\nWhen there is a need to restart/reconfig hw, tear down all the\naggregation queues and let the mac80211 and driver get in-sync to have\nthe opportunity to re-establish the aggregation queues again.\n\nNeed to wait until driver re-establish all the station information before tear\ndown the aggregation queues, driver(at least iwlwifi driver) will reject the\nstop aggregation queue request if station is not ready. But also need to make\nsure the aggregation queues are tear down before waking up the queues, so\nmac80211 will not sending frames with aggregation bit set.\n\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "34e895075e21be3e21e71d6317440d1ee7969ad0",
      "tree": "217fe70e32e54ef0134f477510472f3992655d79",
      "parents": [
        "070bb5477fb4029131aad4941d7aaf0093db0c38"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Wed Feb 03 13:59:58 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:50:53 2010 -0500"
      },
      "message": "mac80211: allow station add/remove to sleep\n\nMany drivers would like to sleep during station\naddition and removal, and currently have a high\ncomplexity there from not being able to.\n\nThis introduces two new callbacks sta_add() and\nsta_remove() that drivers can implement instead\nof using sta_notify() and that can sleep, and\nthe new sta_add() callback is also allowed to\nfail.\n\nThe reason we didn\u0027t do this previously is that\nthe IBSS code wants to insert stations from the\nRX path, which is a tasklet, so cannot sleep.\nThis patch will keep the station allocation in\nthat path, but moves adding the station to the\ndriver out of line. Since the addition can now\nfail, we can have IBSS peer structs the driver\nrejected -- in that case we still talk to the\nstation but never tell the driver about it in\nthe control.sta pointer. If there will ever be\na driver that has a low limit on the number of\nstations and that cannot talk to any stations\nthat are not known to it, we need to do come up\nwith a new strategy of handling larger IBSSs,\nmaybe quicker expiry or rejecting peers.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "070bb5477fb4029131aad4941d7aaf0093db0c38",
      "tree": "2f2e0bda0a7fc3d7772053e53ca7e879a4c57a1c",
      "parents": [
        "33e5a2f776e331dc8a4379b6efb660d38f182d96"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Wed Feb 03 13:57:46 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:50:53 2010 -0500"
      },
      "message": "mac80211: don\u0027t probe if we have probe response\n\nWe can now easily determine whether we already\nhave probe response information for the BSS we\nare asked to connect to, in which case there\u0027s\nlittle point in probing the BSS again.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "33e5a2f776e331dc8a4379b6efb660d38f182d96",
      "tree": "8d89bc3f70063bec4d85d76dc5887cea19da064d",
      "parents": [
        "690680360cd22b55235481ca3421a3450a96138a"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Wed Feb 03 10:24:30 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:50:53 2010 -0500"
      },
      "message": "wireless: update radiotap parser\n\nUpstream radiotap has adopted the namespace\nproposal David Young made and I then took care\nof, for which I had adapted the radiotap parser\nas a library outside the kernel. This brings\nthe in-kernel parser up to speed.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "6e7e6213e4956828927c30e3ef5a42812d00c650",
      "tree": "3e13859aae5ac0a50eecd452e96849e5e373f444",
      "parents": [
        "5ffaf8a361b4c9025963959a744f21d8173c7669",
        "c0ce77b8323c1a0d4eeef97caf16c0ea971222a9"
      ],
      "author": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:38:38 2010 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:38:38 2010 -0500"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n\nConflicts:\n\tnet/mac80211/scan.c\n"
    },
    {
      "commit": "c0ce77b8323c1a0d4eeef97caf16c0ea971222a9",
      "tree": "933f730f9df8f969495d1cbf7b2ddd40bfc40906",
      "parents": [
        "098dfded5b1b09927995e89c6d689f85a0f53384"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Wed Feb 03 10:22:31 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:07:23 2010 -0500"
      },
      "message": "mac80211: fix deferred hardware scan requests\n\nReinette found the reason for the warnings that\nhappened occasionally when a hw-offloaded scan\nfinished; her description of the problem:\n\n  mac80211 will defer the handling of scan requests if it is\n  busy with management work at the time. The scan requests\n  are deferred and run after the work has completed. When\n  this occurs there are currently two problems.\n\n  * The scan request for hardware scan is not fully populated\n    with the band and channels to scan not initialized.\n\n  * When the scan is queued the state is not correctly updated\n    to reflect that a scan is in progress. The problem here is\n    that when the driver completes the scan and calls\n    ieee80211_scan_completed() a warning will be triggered\n    since mac80211 was not aware that a scan was in progress.\n\nThe reason is that the queued scan work will start\nthe hw scan right away when the hw_scan_req struct\nhas already been allocated. However, in the first\npass it will not have been filled, which happens\nat the same time as setting the bits. To fix this,\nsimply move the allocation after the pending work\ntest as well, so that the first iteration of the\nscan work will call __ieee80211_start_scan() even\nin the hardware scan case.\n\nBug-identified-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "0da780c269957783d341fc3559e6b4c9912af7b4",
      "tree": "95d36263c453aefa9c300ee659205ca2c515d24d",
      "parents": [
        "391ae22ae5726d2a8cebfa62879635c54a349642"
      ],
      "author": {
        "name": "Benoit Papillault",
        "email": "benoit.papillault@free.fr",
        "time": "Fri Feb 05 01:21:03 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 08 16:07:22 2010 -0500"
      },
      "message": "mac80211: Fix probe request filtering in IBSS mode\n\nWe only reply to probe request if either the requested SSID is the\nbroadcast SSID or if the requested SSID matches our own SSID. This\nlatter case was not properly handled since we were replying to different\nSSID with the same length as our own SSID.\n\nSigned-off-by: Benoit Papillault \u003cbenoit.papillault@free.fr\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "10be7eb36b93364b98688831ee7d26f58402bb96",
      "tree": "eb13ae80fcaa8baacd804a721c5a4962a501a2a4",
      "parents": [
        "90c30335a70e96b8b8493b7deb15e6b30e6d9fce",
        "5ffaf8a361b4c9025963959a744f21d8173c7669"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Feb 04 08:58:14 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Feb 04 08:58:14 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n"
    },
    {
      "commit": "3c384053ce4cb1949f5575c28e30e6ceea8cb39b",
      "tree": "5cfe0c3803dc8182c722a2a9cc992eec68cdc812",
      "parents": [
        "b4d57adb727ec7c34020390eeb0eeb9e0a2959bc"
      ],
      "author": {
        "name": "Vasanthakumar",
        "email": "vasanth@atheros.com",
        "time": "Mon Feb 01 18:49:07 2010 +0530"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 01 15:40:09 2010 -0500"
      },
      "message": "mac80211: Don\u0027t call rate control when HW handles it\n\nRate control should not be called to update the tx status\nwhen HW does the RC.\n\nSigned-off-by: Vasanthakumar \u003cvasanth@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "b4d57adb727ec7c34020390eeb0eeb9e0a2959bc",
      "tree": "7819dc3d403d80788fdc1c4b5af337fff2989bcf",
      "parents": [
        "17ad353b8d9843731258b5d23556667b764939e9"
      ],
      "author": {
        "name": "Felix Fietkau",
        "email": "nbd@openwrt.org",
        "time": "Sun Jan 31 23:25:24 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 01 15:40:08 2010 -0500"
      },
      "message": "mac80211: fix sta lookup with AP VLAN interfaces and injected frames\n\nWhen injecting frames, mac80211 currently looks for the first AP\ninterface that matches the source address of the injected frame.\nThis breaks when such a frame is directed at a STA that has been moved\nto a VLAN. This patch fixes it by using sta_info_get_bss instead of\nsta_info_get, which also finds stations belonging to a VLAN interface\nof the same BSS as the AP interface.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "17ad353b8d9843731258b5d23556667b764939e9",
      "tree": "26c84253888ded3b008c7b1d8c29763646b673bf",
      "parents": [
        "4754ffd68bc14de8db01451c49bb07adebe1e422"
      ],
      "author": {
        "name": "Felix Fietkau",
        "email": "nbd@openwrt.org",
        "time": "Sun Jan 31 21:56:25 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 01 15:40:08 2010 -0500"
      },
      "message": "mac80211: fix monitor mode tx radiotap header handling\n\nWhen an injected frame gets buffered for a powersave STA or filtered\nand retransmitted, mac80211 attempts to parse the radiotap header\nagain, which doesn\u0027t work because it\u0027s gone at that point.\nThis patch adds a new flag for checking the availability of a radiotap\nheader, so that it only attempts to parse it once, reusing the tx info\non the next call to ieee80211_tx().\nThis fixes severe issues with rekeying in AP mode.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nCc: stable@kernel.org\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "4754ffd68bc14de8db01451c49bb07adebe1e422",
      "tree": "4ca57be079cc9b46b66898e8a9f0966b83d06645",
      "parents": [
        "e0b20f1c67fc4379fce430ff720969f35e123eed"
      ],
      "author": {
        "name": "Felix Fietkau",
        "email": "nbd@openwrt.org",
        "time": "Sun Jan 31 21:50:12 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 01 15:40:08 2010 -0500"
      },
      "message": "mac80211: fix sta lookup for received action frames on an AP VLAN\n\nWhen looking for a matching interface, __ieee80211_rx_handle_packet\nloops over all active interfaces, looking for matching stations.\nBecause AP VLAN interfaces are not processed as part of this loop, it\nneeds to use sta_info_get_bss instead of sta_info_get in order to find\na STA that has been moved to a VLAN.\nThis fixes issues with aggregation setup/teardown.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "e0b20f1c67fc4379fce430ff720969f35e123eed",
      "tree": "663994145a9e1580f312e2c3527b983d223429d0",
      "parents": [
        "4c82bf8e5689b1dddd9bcec70efc3b70edef1670"
      ],
      "author": {
        "name": "Pavel Roskin",
        "email": "proski@gnu.org",
        "time": "Sat Jan 30 19:55:27 2010 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 01 15:40:07 2010 -0500"
      },
      "message": "mac80211: reduce stack usage in sta_agg_status_read()\n\nUse a more compact and readable format for \"agg_status\" to reduce the\nstack frame to less than 1024 bytes.\n\nSigned-off-by: Pavel Roskin \u003cproski@gnu.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "4c82bf8e5689b1dddd9bcec70efc3b70edef1670",
      "tree": "28ad6c29c4b121e0a0aa5013d7ee67ed5d2de3a2",
      "parents": [
        "9501fefec6aa9a3319bb61edb99851ba30653f30"
      ],
      "author": {
        "name": "Pavel Roskin",
        "email": "proski@gnu.org",
        "time": "Sat Jan 30 19:55:09 2010 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Feb 01 15:40:07 2010 -0500"
      },
      "message": "mac80211: reduce stack usage in sta_ht_capa_read()\n\nThe maximal size of the \"ht_capa\" file is 430 bytes.  In most cases,\nit\u0027s much shorter.  Use a 512 byte long buffer.  1024 bytes is too much\nand causes a warning with CONFIG_FRAME_WARN\u003d1024.\n\nSigned-off-by: Pavel Roskin \u003cproski@gnu.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "05ba712d7eb156009753e18e5116cabd869cc6e2",
      "tree": "1ad850d6889f6b3671a5636653940f20a7d22bdf",
      "parents": [
        "257ddbdad13cd3c4f7d03b85af632c508aa8abc9",
        "b473946a0853860e13b51c28add5524741117786"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jan 28 06:12:38 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jan 28 06:12:38 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n"
    },
    {
      "commit": "744595c847cefd6ac0eec8f66e9fba95687c3f4f",
      "tree": "3d4b4e5213b584567d87f705f369808d7cfe8dbd",
      "parents": [
        "c928febf4bc703ea542340e5a208e0445d998839",
        "3092ad054406f069991ca561adc74f2d9fbb6867"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jan 28 05:42:33 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Thu Jan 28 05:42:33 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n"
    },
    {
      "commit": "56007a028c51cbf800a6c969d6f6431d23443b99",
      "tree": "8bc0280467824ed3b5f95810444b1f8e1ebc2750",
      "parents": [
        "c21dbf9214bce129f92e1af05552553ff0e318ed"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Tue Jan 26 14:19:52 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 26 11:53:21 2010 -0500"
      },
      "message": "mac80211: wait for beacon before enabling powersave\n\nBecause DTIM information is required for powersave\nbut is only conveyed in beacons, wait for a beacon\nbefore enabling powersave, and change the way the\ninformation is conveyed to the driver accordingly.\n\nmwl8k doesn\u0027t currently seem to implement PS but\nrequires the DTIM period in a different way; after\ntalking to Lennert we agreed to just have mwl8k do\nthe parsing itself in the finalize_join work.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nAcked-by: Lennert Buytenhek \u003cbuytenh@marvell.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "3092ad054406f069991ca561adc74f2d9fbb6867",
      "tree": "498446eccd918d1fb4655a70422210c0c4d63394",
      "parents": [
        "aa8bc9ef18a2c5b2b97e1f36ee9604cf15743f96"
      ],
      "author": {
        "name": "Zhu Yi",
        "email": "yi.zhu@intel.com",
        "time": "Tue Jan 26 15:58:57 2010 +0800"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 26 11:52:13 2010 -0500"
      },
      "message": "mac80211: fix NULL pointer dereference when ftrace is enabled\n\nI got below kernel oops when I try to bring down the network interface if\nftrace is enabled. The root cause is drv_ampdu_action() is passed with a\nNULL ssn pointer in the BA session tear down case. We need to check and\navoid dereferencing it in trace entry assignment.\n\nBUG: unable to handle kernel NULL pointer dereference\nModules linked in: at (null)\nIP: [\u003cf98fe02a\u003e] ftrace_raw_event_drv_ampdu_action+0x10a/0x160 [mac80211]\n*pde \u003d 00000000\nOops: 0000 [#1] SMP DEBUG_PAGEALLOC\n[...]\nCall Trace:\n [\u003cf98fdf20\u003e] ? ftrace_raw_event_drv_ampdu_action+0x0/0x160 [mac80211]\n [\u003cf98dac4c\u003e] ? __ieee80211_stop_rx_ba_session+0xfc/0x220 [mac80211]\n [\u003cf98d97fb\u003e] ? ieee80211_sta_tear_down_BA_sessions+0x3b/0x50 [mac80211]\n [\u003cf98dc6f6\u003e] ? ieee80211_set_disassoc+0xe6/0x230 [mac80211]\n [\u003cf98dc6ac\u003e] ? ieee80211_set_disassoc+0x9c/0x230 [mac80211]\n [\u003cf98dcbb8\u003e] ? ieee80211_mgd_deauth+0x158/0x170 [mac80211]\n [\u003cf98e4bdb\u003e] ? ieee80211_deauth+0x1b/0x20 [mac80211]\n [\u003cf8987f49\u003e] ? __cfg80211_mlme_deauth+0xe9/0x120 [cfg80211]\n [\u003cf898b870\u003e] ? __cfg80211_disconnect+0x170/0x1d0 [cfg80211]\n\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nCc: stable@kernel.org\nSigned-off-by: Zhu Yi \u003cyi.zhu@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "18c949070b57d2cbcc0b25c5cfa003ece204e468",
      "tree": "7f4c82063105476ba96a78a7a9f1d91248d8193f",
      "parents": [
        "f2982181e0531c0b12752336a1578626f99e7828"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Mon Jan 25 19:07:39 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Jan 25 16:40:49 2010 -0500"
      },
      "message": "mac80211: fill jiffies/vif on filtered frames\n\nFiltered frames not only need their control information\ncleared to avoid wrong checks, but also need to have\njiffies and vif assigned so they can be processed or\nexpired.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "723bae7ee44fd79c1cd3c7531ed581d373920774",
      "tree": "2f82c098aeb61694d4f6e1ec7f9bb3c29b7d43f3",
      "parents": [
        "382b16559d599c4260aeb82a5ea5ba44459d1cd2"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Mon Jan 25 13:36:36 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Jan 25 16:36:29 2010 -0500"
      },
      "message": "mac80211: track work started through callbacks\n\nCurrently, the remain_on_channel work callback needs\nto track in its own data structure whether the work\nwas just started or not. By reordering some code this\nbecomes unnecessary, the generic wk-\u003estarted variable\ncan still be \u0027false\u0027 on the first invocation and only\nbe \u0027true\u0027 on actual timeout invocations, so that the\nextra variable can be removed.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "382b16559d599c4260aeb82a5ea5ba44459d1cd2",
      "tree": "dcb1b16424bf90aea7712625c2975b60c9fe9dc0",
      "parents": [
        "1396b231b0369c4146988c2f42fb416ae19e2572"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Mon Jan 25 11:36:16 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Jan 25 16:36:29 2010 -0500"
      },
      "message": "mac80211: fix sw crypto\n\nWhat a stupid mistake. In\n\n    commit 813d76694043d00b59475baa1fbfaf54a2eb7fad\n    Author: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\n    Date:   Sun Jan 17 01:47:58 2010 +0100\n\n        mac80211: move control.hw_key assignment\n\nI inserted code testing the wrong flags field,\nwhich means that the test is almost always true\n(it\u0027s really testing for the peer\u0027s WMM support)\nand thus the later parts of the stack assume hw\ncrypto will be done even if that\u0027s not true.\n\nObviously, that broke software crypto. Maxim\nsaid so specifically, and Jochen probably uses\nsome cipher that iwl3945 doesn\u0027t support in\nhardware, which might also explain that Maxim\nreports that even hw crypto is broken.\n\nFix this to test the right flags field.\n\nReported-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nReported-by: Jochen Friedrich \u003cjochen@scram.de\u003e\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "1396b231b0369c4146988c2f42fb416ae19e2572",
      "tree": "3afd6b356b33d712eb88a01472cdf2a873f1d4ca",
      "parents": [
        "eb807fb23878bc319e029ed8ce3d835d239723a5"
      ],
      "author": {
        "name": "Felix Fietkau",
        "email": "nbd@openwrt.org",
        "time": "Sun Jan 24 20:44:35 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Jan 25 16:36:28 2010 -0500"
      },
      "message": "mac80211: fix WARN_ON in the new work code\n\nieee80211_work_rx_mgmt currently enqueues various management frames,\nincluding deauth and disassoc frames, however the function\nieee80211_work_rx_queued_mgmt does not handle these, as they should\nonly occur if the AP is buggy. It does emit a WARN_ON when this happens\nthough, and several users have reported such instances.\nFix the WARN_ON by not queueing such frames in the first place.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "eb807fb23878bc319e029ed8ce3d835d239723a5",
      "tree": "0caf36c7c128825292c3c23f04c6e5eb0f74cafb",
      "parents": [
        "96869a39399269a776a94812e9fff3d38b47d838"
      ],
      "author": {
        "name": "Kalle Valo",
        "email": "kalle.valo@iki.fi",
        "time": "Sun Jan 24 14:55:12 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Jan 25 16:36:28 2010 -0500"
      },
      "message": "mac80211: fix update_tkip_key() documentation about the context\n\nJohannes noticed that I had incorrectly documented the context of\nupdate_tkip_key() driver operation. It must be atomic because all\nRX code is run inside rcu critical section.\n\nReported-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: Kalle Valo \u003ckalle.valo@iki.fi\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "3b43a18743421cccd33902e29016fa49b2d52dbb",
      "tree": "eaaab22a16260625854a51076fe64d5787e98ac4",
      "parents": [
        "f12553ebe045a8a40ab33fa500fb57d10706e226"
      ],
      "author": {
        "name": "Kalle Valo",
        "email": "kalle.valo@iki.fi",
        "time": "Sat Jan 23 20:27:14 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Sat Jan 23 16:47:00 2010 -0500"
      },
      "message": "mac80211: fix tx select key null pointer crash with hostapd\n\nPavel Roskin reported a crash in ieee80211_tx_h_select_key():\n\nhttp://marc.info/?l\u003dlinux-wireless\u0026m\u003d126419655108528\u0026w\u003d2\n\nThis is a regression from patch \"mac80211: move control.hw_key assignment\".\nFix it as suggested by Johannes, adding an else statement to make sure\nthat tx-\u003ekey is not accessed when it\u0027s null.\n\nCompile-tested only.\n\nReported-by: Pavel Roskin \u003cproski@gnu.org\u003e\nCc: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: Kalle Valo \u003ckalle.valo@iki.fi\u003e\nTested-by: Bob Copeland \u003cme@bobcopeland.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "51c24aaacaea90c8e87f1dec75a2ac7622b593f8",
      "tree": "9f54936c87764bef75e97395cb56b7d1e0df24c6",
      "parents": [
        "4276e47e2d1c85a2477caf0d22b91c4f2377fba8",
        "6be325719b3e54624397e413efd4b33a997e55a3"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Jan 23 00:31:06 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Sat Jan 23 00:31:06 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n"
    },
    {
      "commit": "f12553ebe045a8a40ab33fa500fb57d10706e226",
      "tree": "936682b710e2bb6e132a2ec4ecae9c96e64d42ec",
      "parents": [
        "b92f7d30830a319148df2943b7565989494e5ad1"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Fri Jan 22 22:07:59 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Jan 22 16:33:28 2010 -0500"
      },
      "message": "mac80211: add missing key check\n\nieee80211_tx_h_select_key might decide that a frame\nneed not be encrypted at all, in which case it will\nclear tx-\u003ekey. In that case it may crash if a key\nwas previously selected, e.g. as the default key.\n\nThis is also due to my patch\n\"mac80211: move control.hw_key assignment\".\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "4bb29f8c390fb7be207ec3f11b9d30ccdf1cb6ac",
      "tree": "27eea1536ee2272eeeb5bd85806e38a77cfe702a",
      "parents": [
        "58da1318ee92ad3fe7917278d596768bbe441850"
      ],
      "author": {
        "name": "Felix Fietkau",
        "email": "nbd@openwrt.org",
        "time": "Fri Jan 22 00:36:39 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Jan 22 16:11:33 2010 -0500"
      },
      "message": "mac80211: fix rx data handling for non-data frames on multiple vifs\n\nThe loop that passes non-data frames to all relevant vifs inside the\n__ieee80211_rx_handle_packet keeps a pointer to the previous sdata to\navoid having to make unnecessary copies of the frame it\u0027s handling.\nThis led to a bug that caused it to apply the ieee80211_rx_data state\nto the wrong interface, thereby either missing the rx.sta pointer or\nhaving it assigned where it shouldn\u0027t be.\nThis breaks (among other things) aggregation on some vifs, as action\nframe exchages are dropped to the cooked monitor interface due to\nrx-\u003esta being NULL.\nFix this by restructuring the loop so that it prepares the rx data just\nbefore making the skb copy and calling the rx handlers.\n\nCc: stable@kernel.org\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "b3fbdcf49f940d0703c356441e0daf045e64e076",
      "tree": "f63416cc9b80a6757ec6fa57190f581b2b3a6d31",
      "parents": [
        "e4fca007b06165900d0e44e8d5e251376819bf5d"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Thu Jan 21 11:40:47 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Jan 22 16:08:55 2010 -0500"
      },
      "message": "mac80211: pass vif and station to update_tkip_key\n\nWhen a TKIP key is updated, we should pass the station\npointer instead of just the address, since drivers can\nuse that to store their own data. We also need to pass\nthe virtual interface pointer.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "e4fca007b06165900d0e44e8d5e251376819bf5d",
      "tree": "3abf108c8ff0ab50de3875bd1dd5b05454e30f98",
      "parents": [
        "64147c729732ba9c9e50966971bdfbd503c888bb"
      ],
      "author": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Jan 22 12:33:09 2010 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Jan 22 12:39:14 2010 -0500"
      },
      "message": "mac80211: avoid NULL ptr deref when using WEP\n\n\"mac80211: move control.hw_key assignment\" changed an if-else into two\nseparate if statments, but the if-else is needed to prevent\ndereferencing a null info-\u003econtrol.hw_key.  This fixes avoids a lock-up\nduring association on my machine when using WEP.\n\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "a98bfec2985221d8e0904a526cbe88590eaad2a6",
      "tree": "62f44c77e246e3bd1173cb1c79eeadc62e3cb2d1",
      "parents": [
        "ce9058aedd75f14785400dcc49a2bc352ca38871"
      ],
      "author": {
        "name": "Benoit Papillault",
        "email": "benoit.papillault@free.fr",
        "time": "Sun Jan 17 22:45:24 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 16:43:10 2010 -0500"
      },
      "message": "mac80211: Fixed a bug in IBSS merge\n\nFirst, both beacons and probe responses can be used for IBSS merge.\nNext, sdata-\u003eu.ibss.bssid was always true (and thus IBSS merge was\ndisabled). We should use sdata-\u003eu.ibss.fixed_bssid instead.\n\nSigned-off-by: Benoit Papillault \u003cbenoit.papillault@free.fr\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "ce9058aedd75f14785400dcc49a2bc352ca38871",
      "tree": "740d87df4395175ae648c46553b8f44bb5e69631",
      "parents": [
        "27032059677b98f33634ceb90488812db432cbc9"
      ],
      "author": {
        "name": "Benoit Papillault",
        "email": "benoit.papillault@free.fr",
        "time": "Sun Jan 17 22:45:23 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 16:43:10 2010 -0500"
      },
      "message": "mac80211: removed useless code in IBSS management\n\nieee82011_sta_find_ibss() and ieee80211_sta_merge_ibss() are always\ncalled with a defined state. So it\u0027s useless to check it or set it in\nthose function.\n\nSigned-off-by: Benoit Papillault \u003cbenoit.papillault@free.fr\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "c6fcf6bcfc3cfc1c00cc7fd9610cfa2b1a18041f",
      "tree": "301713d3f65f3cc9cb99e374c655d6f8bf99c741",
      "parents": [
        "813d76694043d00b59475baa1fbfaf54a2eb7fad"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Sun Jan 17 01:47:59 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 16:25:21 2010 -0500"
      },
      "message": "mac80211: re-enable re-transmission of filtered frames\n\nIn an earlier commit,\n\n    mac80211: disable software retry for now\n\n    Pavel Roskin reported a problem that seems to be due to\n    software retry of already transmitted frames. It turns\n    out that we\u0027ve never done that correctly, but due to\n    some recent changes it now crashes in the TX code. I\u0027ve\n    added a comment in the patch that explains the problem\n    better and also points to possible solutions -- which\n    I can\u0027t implement right now.\n\nI disabled software retry of failed/filtered frames\nbecause it was broken. With the work of the previous\npatches, it now becomes fairly easy to re-enable it\nby adding a flag indicating that the frame shouldn\u0027t\nbe modified, but still running it through the transmit\nhandlers to populate the control information.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "813d76694043d00b59475baa1fbfaf54a2eb7fad",
      "tree": "daad130ca0a9e90f7616d88e5433654df89af14a",
      "parents": [
        "a6bae9e7ab19876a157c91019852395539e4f20e"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Sun Jan 17 01:47:58 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 16:25:19 2010 -0500"
      },
      "message": "mac80211: move control.hw_key assignment\n\nWhen mac80211 asks a driver to encrypt a frame, it\nmust assign the control.hw_key pointer for it to\nknow which key to use etc. Currently, mac80211 does\nthis whenever it would software-encrypt a frame.\n\nChange the logic of this code to assign the hw_key\npointer when selecting the key, and later check it\nwhen deciding whether to encrypt the frame or let\nit be encrypted by the hardware. This allows us to\nlater simply skip the encryption function since it\nno longer modifies the TX control.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "a6bae9e7ab19876a157c91019852395539e4f20e",
      "tree": "221b68a7d938c40e48782a208392554812b60d75",
      "parents": [
        "697e6a0fb0c8783695d4b4a5d7131476b296d623"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Sun Jan 17 01:47:57 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 16:25:17 2010 -0500"
      },
      "message": "mac80211: remove useless setting of IEEE80211_TX_INTFL_DONT_ENCRYPT\n\nThere\u0027s no value in setting a flag that will\nnever be checked after this point, this seems\nto be legacy code -- I think previously the\nflag was used to check whether to encrypt the\nframe or not. Now, however, the flag need not\nbe set, and setting it actually interferes if\nthe frame will be processed again later.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "697e6a0fb0c8783695d4b4a5d7131476b296d623",
      "tree": "fb64bc9a92a200405736683843a58209230b4056",
      "parents": [
        "edc6ccb7b992bd9ea5db4555c8f0bf74c656f964"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Sun Jan 17 01:47:56 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 16:25:16 2010 -0500"
      },
      "message": "mac80211: clear TX control on filtered frames\n\nWhen an skb survived a round-trip through the driver\nand needs to be re-used, its control information is\ndefinitely not valid any more, the driver will have\noverwritten it.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "edc6ccb7b992bd9ea5db4555c8f0bf74c656f964",
      "tree": "e73676345e80609767d3c2b60f80e70324ac240b",
      "parents": [
        "8e9310c1790566ea2de2e8b6e1c04bacbbee648c"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Sun Jan 17 01:47:55 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 16:25:16 2010 -0500"
      },
      "message": "mac80211: move and rename misc tx handler\n\nThis TX handler is used only for assigning the\nstation pointer in the control information, so\ngive it a better name. Also move it before rate\ncontrol.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "8e9310c1790566ea2de2e8b6e1c04bacbbee648c",
      "tree": "eb997c22b6521da1062f6d713fd74b99f0381bda",
      "parents": [
        "1f44780827c6bbbcd1f12d5c6b6ce84f49a96bc0"
      ],
      "author": {
        "name": "Bob Copeland",
        "email": "me@bobcopeland.com",
        "time": "Sat Jan 16 14:36:53 2010 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 16:25:15 2010 -0500"
      },
      "message": "mac80211: pid: replace open-coded msecs_to_jiffies\n\nCode directly scaling by HZ and rounding can be more efficiently\nand clearly performed with msecs_to_jiffies.\n\nSigned-off-by: Bob Copeland \u003cme@bobcopeland.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "861a57cd01f97e984320b5aeeee019ede48c714d",
      "tree": "aeb4997f87d97299bad1563bc93b6ec2df015e06",
      "parents": [
        "031cf0e94c9c8302a4592707939d6c2039f17f28"
      ],
      "author": {
        "name": "Felix Fietkau",
        "email": "nbd@openwrt.org",
        "time": "Tue Jan 12 04:08:26 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 16:25:07 2010 -0500"
      },
      "message": "mac80211: fix WMM AC default for non-QoS data frames\n\nThe WMM AC selection added to the monitor mode selection function\naccidentally assigns non-QoS data frames to the same AC as mgmt frames\n(VO). This is not serious, but should be fixed anyway. This patch\nassigns them to the BE AC instead.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "031cf0e94c9c8302a4592707939d6c2039f17f28",
      "tree": "02f3f0d3f89f03217bdb83530af30a95c9ab6191",
      "parents": [
        "730dd70549e0ec755dd55615ba5cfc38a482a947",
        "ad580db50ee8dccd069ffcd76d6f70fa6d4a62a8"
      ],
      "author": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 15:58:41 2010 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 19 15:58:41 2010 -0500"
      },
      "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n"
    },
    {
      "commit": "6373464288cab09bc641be301d8d30fc9f64ba71",
      "tree": "c1bc92dc630aa15da2e12bc0d09c92169817a702",
      "parents": [
        "6d955180b2f9ccff444df06265160868cabb289a",
        "730dd70549e0ec755dd55615ba5cfc38a482a947"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jan 19 11:43:42 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jan 19 11:43:42 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6\n\nConflicts:\n\tdrivers/net/wireless/iwlwifi/iwl-core.h\n"
    },
    {
      "commit": "dad48a4ef20774732e53840f371b0cc27981c43a",
      "tree": "d511fa1e4566361f131ac0dcf446780e1d92f469",
      "parents": [
        "98f672ca9978c6e5997dbe905c91a73593148a7e",
        "ad580db50ee8dccd069ffcd76d6f70fa6d4a62a8"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jan 19 02:03:09 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jan 19 02:03:09 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n"
    },
    {
      "commit": "e850f68b8f27a76c4377c34f2e216b8e7e10db3d",
      "tree": "0b2a6ffb15ede031c149d8c37a5ba359bb5695f8",
      "parents": [
        "bb5d2db5709e469f4a8c01eaaee9a275ed9772aa"
      ],
      "author": {
        "name": "Bob Copeland",
        "email": "me@bobcopeland.com",
        "time": "Sat Jan 16 14:36:52 2010 -0500"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Mon Jan 18 15:07:02 2010 -0500"
      },
      "message": "mac80211: fix sign error in pid controller\n\nWhile testing the pid rate controller in mac80211_hwsim, I noticed\nthat once the controller reached 54 Mbit rates, it would fail to\nlower the rate when necessary.  The debug log shows:\n\n1945 186786 pf_sample 50 3534 3577 50\n\nMy interpretation is that the fixed point scaling of the target\nerror value (pf) is incorrect: the error value of 50 compared to\na target of 14 case should result in a scaling value of\n(14-50) \u003d -36 * 256 or -9216, but instead it is (14 * 256)-50, or\n3534.\n\nCorrect this by doing fixed point scaling after subtraction.\n\nSigned-off-by: Bob Copeland \u003cme@bobcopeland.com\u003e\nAcked-by: Stefano Brivio \u003cstefano.brivio@polimi.it\u003e\nAcked-by: Mattias Nissler \u003cmattias.nissler@gmx.de\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "145b6d1a56f224d15c61aa7ecfda9a1171b47b6a",
      "tree": "748dacf833dfe08f64536ad2b27abf412645f38b",
      "parents": [
        "43d3534344bbdcfa9c61a6b38490cd4cbb2f6bb6"
      ],
      "author": {
        "name": "Ming Lei",
        "email": "tom.leiming@gmail.com",
        "time": "Fri Jan 15 21:44:21 2010 +0800"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Jan 15 17:02:08 2010 -0500"
      },
      "message": "mac80211: fix memory leak in ieee80211_send_probe_req\n\nThis patch fixes memory leak in ieee80211_send_probe_req, which\nis introduced in 7c12ce8b854df346388ea56d684784e3484012cf:\n\n\tmac80211: use Probe Request template when sending a direct scan\n\nThe patch is against the latest wireless-test tree.\n\nSigned-off-by: Ming Lei \u003ctom.leiming@gmail.com\u003e\nReviewed-by: Kalle Valo \u003ckalle.valo@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "43d3534344bbdcfa9c61a6b38490cd4cbb2f6bb6",
      "tree": "66b87eb3d8c1751af37cf66afde977bb100db4a8",
      "parents": [
        "84920e3e47f654a22b540606fb8c1ab90b870942"
      ],
      "author": {
        "name": "Felix Fietkau",
        "email": "nbd@openwrt.org",
        "time": "Fri Jan 15 03:00:48 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Jan 15 17:02:07 2010 -0500"
      },
      "message": "mac80211: force use_short_slot\u003dtrue for 5GHz\n\nNormally 5GHz does not have a concept of long vs short slot time,\nhowever the slot time that it ends up using is the same as for 2.4 GHZ\nand use_short_slot \u003d\u003d true\nBecause of that, it makes more sense to force use_short_slot \u003d true\nwhenever 5 GHz is being used, so that this particular check does not\nhave to be in every single driver that uses this flag.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "93895757df4ebe22c98b9128b98ebf8cec972c60",
      "tree": "8603e3147d14ec9b52ba7f75ff1b13c099aed1b7",
      "parents": [
        "b6b1ac69372da996f40863358df41ca77075b249"
      ],
      "author": {
        "name": "Benoit Papillault",
        "email": "benoit.papillault@free.fr",
        "time": "Thu Jan 14 23:20:31 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Jan 15 16:58:28 2010 -0500"
      },
      "message": "mac80211: Fixed netif_tx_wake_all_queues in IBSS mode\n\nWhen ieee80211_offchannel_return is called, it needs to re-enabled TX\nqueues that have been stopped in ieee80211_offchannel_stop_beaconing or\nieee80211_offchannel_stop_station. It happens if we are doing a scan with an\nIBSS interface. In this case, the interface stopped transmitting.\n\nSigned-off-by: Benoit Papillault \u003cbenoit.papillault@free.fr\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "e5de30c9bf4a39db9f54c4a373470ce65881ade0",
      "tree": "9eaa6e67bdf770ccf6c98497f3a2dec2778fa4db",
      "parents": [
        "5f6120335c701ba07d5151206071f4d6ccaa684f"
      ],
      "author": {
        "name": "Benoit Papillault",
        "email": "benoit.papillault@free.fr",
        "time": "Fri Jan 15 12:21:37 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Fri Jan 15 16:20:22 2010 -0500"
      },
      "message": "mac80211: check that ieee80211_set_power_mgmt only handles STA interfaces.\n\nieee80211_set_power_mgmt is meant for STA interfaces only. Moreover,\nsince sdata-\u003eu.mgd.mtx is only initialized for STA interfaces, using\nthis code for any other type of interface (like creating a monitor\ninterface) will result in a oops.\n\nCc: stable@kernel.org\nSigned-off-by: Benoit Papillault \u003cbenoit.papillault@free.fr\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "ff30b3642c1f56a5ae6522b78e82be867086c637",
      "tree": "160f2dfd9d98a0d64ba9eb01574888b04905b58d",
      "parents": [
        "9db2f1bec36805e57a003f7bb90e003815d96de8",
        "8c5d9808e95739c9001b852464fd58fd0f583280"
      ],
      "author": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jan 12 21:33:49 2010 -0800"
      },
      "committer": {
        "name": "David S. Miller",
        "email": "davem@davemloft.net",
        "time": "Tue Jan 12 21:33:49 2010 -0800"
      },
      "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n"
    },
    {
      "commit": "0c74211d19d83729c209ddcd4dc026c2aedeb29e",
      "tree": "31e81616c508d63aef0ad418dc4252b87d1be208",
      "parents": [
        "5c1b98a52c3af1044c2d3842af8bae9a89502ca9"
      ],
      "author": {
        "name": "Kalle Valo",
        "email": "kalle.valo@nokia.com",
        "time": "Tue Jan 12 10:42:53 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 12 14:21:02 2010 -0500"
      },
      "message": "mac80211: check uapsd state for dynamic power save\n\nTo make U-APSD client mode effective, we must not wake up from dynamic power\nsave when transmitting frames. So if dynamic power save is enabled, it needs\ncheck the queue the transmitted packet is in and decide if we need to wake\nup or not.\n\nIn a perfect world, where all packets would have correct QoS tags, U-APSD\nenabled queues should not trigger wakeup from power save. But in the real\nworld, where very few packets have correct QoS tags, this won\u0027t work. For\nexample, if only voip class has U-APSD enabled and we send a packet in voip\nclass, but the packets we receive are in best effort class, we would receive\nthe packets with the legacy power save method. And that would increase\nlatencies too much from a voip application point of view.\n\nThe workaround is to enable U-APSD for all qeueus and still use dynamic ps\nwakeup for all other queues except voip. That way we can still save power\nwith a voip application and not sacrifice latency. Normal traffic (in\nbackground, best effort or video class) would still trigger wakeup from\ndynamic power save.\n\nSigned-off-by: Kalle Valo \u003ckalle.valo@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "5c1b98a52c3af1044c2d3842af8bae9a89502ca9",
      "tree": "6df9e13ba8fb0213238e56be04361efa3c1af139",
      "parents": [
        "50ae0cf15c3da2f6a8e4558de5010923e84736b2"
      ],
      "author": {
        "name": "Kalle Valo",
        "email": "kalle.valo@nokia.com",
        "time": "Tue Jan 12 10:42:46 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 12 14:21:01 2010 -0500"
      },
      "message": "mac80211: create tx handler for dynamic ps\n\nCurrently dynamic ps check is in ieee80211_xmit(), but it\u0027s cleaner\nto have a separate tx handler for this. Also this is a prerequisite for\nU-APSD client mode which needs to know the queue frame is in.\n\nAlso need_dynamic_ps() function is embedded to the tx handler.\n\nNo functional changes expect that the code is run in a later phase than\noriginally.\n\nSigned-off-by: Kalle Valo \u003ckalle.valo@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "50ae0cf15c3da2f6a8e4558de5010923e84736b2",
      "tree": "a524720a3da8eac3e08ef7dd7ec67d0f30283f78",
      "parents": [
        "ab13315af97919fae0e014748105fdc2e30afb2d"
      ],
      "author": {
        "name": "Kalle Valo",
        "email": "kalle.valo@nokia.com",
        "time": "Tue Jan 12 10:42:39 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 12 14:21:00 2010 -0500"
      },
      "message": "mac80211: add debugfs interface for U-APSD queue configuration\n\nBecause it\u0027s not yet decided how to configure which queues are U-APSD\nenabled, add a debugfs interface for testing purposes.\n\nSigned-off-by: Kalle Valo \u003ckalle.valo@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "ab13315af97919fae0e014748105fdc2e30afb2d",
      "tree": "befa549272ecff20b2839bd6671e4cccbce448f9",
      "parents": [
        "2d46d7c121436f1dafe91b0a8d9b99e534cfa5f8"
      ],
      "author": {
        "name": "Kalle Valo",
        "email": "kalle.valo@nokia.com",
        "time": "Tue Jan 12 10:42:31 2010 +0200"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 12 14:20:58 2010 -0500"
      },
      "message": "mac80211: add U-APSD client support\n\nAdd Unscheduled Automatic Power-Save Delivery (U-APSD) client support. The\nidea is that the data frames from the client trigger AP to send the buffered\nframes with ACs which have U-APSD enabled. This decreases latency and makes it\npossible to save even more power.\n\nDriver needs to use IEEE80211_HW_UAPSD to enable the feature. The current\nimplementation assumes that firmware takes care of the wakeup and\nhardware needing IEEE80211_HW_PS_NULLFUNC_STACK is not yet supported.\n\nTested with wl1251 on a Nokia N900 and Cisco Aironet 1231G AP and running\nvarious test traffic with ping.\n\nSigned-off-by: Kalle Valo \u003ckalle.valo@nokia.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "2d46d7c121436f1dafe91b0a8d9b99e534cfa5f8",
      "tree": "60b044cdb2e2c01e2d66ce91f95687f2dd3e3a58",
      "parents": [
        "678f415fdc534c0a806fce992e4c62df0eff19d2"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Sun Jan 10 17:12:41 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 12 14:20:57 2010 -0500"
      },
      "message": "mac80211: remove unused type argument\n\nThe type argument to DEBUGFS_ADD() isn\u0027t used\nand can be removed, it\u0027s around from before\nthe conversion to debugfs_remove_recursive().\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "678f415fdc534c0a806fce992e4c62df0eff19d2",
      "tree": "b3313257eca6f22d0ffdb65949c5b22e9c19fbe6",
      "parents": [
        "5e124bd5e00fcf54df555b368c2dafe6886f1df2"
      ],
      "author": {
        "name": "Lennert Buytenhek",
        "email": "buytenh@wantstofly.org",
        "time": "Sun Jan 10 14:07:53 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 12 14:20:56 2010 -0500"
      },
      "message": "mac80211: flush workqueue before calling driver -\u003estop() method\n\nSince commit \"mwl8k: handle station database update for AP\u0027s sta entry\nvia -\u003esta_notify()\", mwl8k every now and then gets a command timeout\nwhen ifconfig\u0027ing a STA interface down.  This turns out to be due to\nmwl8k_stop() being called while the work queue item that was scheduled\nby mwl8k_sta_notify() to remove the STA entry for the associated AP is\nstill queued, and the former disables interrupts so that when the\nlatter eventually runs, a command completion interrupt is never seen.\n\nFix this by changing ieee80211_stop_device() so that the workqueue is\nflushed before drv_stop() is called, instead of doing it the other way\naround as is done now.  (As -\u003estop() is allowed to sleep, there isn\u0027t\nany reason for drivers to queue work from within it.)\n\nSigned-off-by: Lennert Buytenhek \u003cbuytenh@marvell.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "5e124bd5e00fcf54df555b368c2dafe6886f1df2",
      "tree": "e6349981733e53bb0624dc0e6c63bb3015cf1cf4",
      "parents": [
        "28f63a4bb744ea81030219aba2337fddb10b380b"
      ],
      "author": {
        "name": "Joe Perches",
        "email": "joe@perches.com",
        "time": "Fri Jan 08 22:33:38 2010 -0800"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 12 14:20:55 2010 -0500"
      },
      "message": "net/mac80211/mlme.c: Remove unnecessary semicolons\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    },
    {
      "commit": "90be561b119a9e5439733f09cc70bd4ce9ec8022",
      "tree": "5fe3d187ed31f553dcde5056b6e6d21f135d59cb",
      "parents": [
        "67e2eb27958cae758ccbc86443c360ec285acc3e"
      ],
      "author": {
        "name": "Johannes Berg",
        "email": "johannes@sipsolutions.net",
        "time": "Fri Jan 08 19:01:07 2010 +0100"
      },
      "committer": {
        "name": "John W. Linville",
        "email": "linville@tuxdriver.com",
        "time": "Tue Jan 12 14:02:11 2010 -0500"
      },
      "message": "mac80211: fix return from ieee80211_assoc_success\n\nsparse pointed out that I made a mistake converting\nthe return value of ieee80211_assoc_success to bool,\nthis place should return false instead of one of the\nenum values (which would be true).\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n"
    }
  ],
  "next": "3f0e0b220f80075ce15483b20458192c0ac27426"
}
