gmane.linux.kernel.commits.head

GFS2: two minor quota fixups

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=37f715774e2dd9ae521334dbbc3af63becd47adb
Commit:     37f715774e2dd9ae521334dbbc3af63becd47adb
Parent:     c7788792a5e7b0d5d7f96d0766b4cb6112d47d75
Author:     Bob Peterson <rpeterso< at >redhat.com>
AuthorDate: Fri May 10 11:59:18 2013 -0400
Committer:  Steven Whitehouse <swhiteho< at >redhat.com>
CommitDate: Fri May 24 13:47:13 2013 +0100

    GFS2: two minor quota fixups
    
    This patch fixes two regression problems that Abhi found in the
    GFS2 quota code.
    
    Signed-off-by: Bob Peterson <rpeterso< at >redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho< at >redhat.com>
---
 fs/gfs2/quota.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index c7c840e..c253b13 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
< at >< at > -121,7 +121,7 < at >< at > static u64 qd2index(struct gfs2_quota_data *qd)
 {
 struct kqid qid = qd->qd_id;
 return (2 * (u64)from_kqid(&init_user_ns, qid)) +
-(qid.type == USRQUOTA) ? 0 : 1;

net: ethernet: apple: drop unused variable

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=da2e2c214953f37c2a6be20226537ca5a329724c
Commit:     da2e2c214953f37c2a6be20226537ca5a329724c
Parent:     bcef9a8f6f1dcff2a9bbe4ee21bfc50cc230984b
Author:     Emilio López <emilio< at >elopez.com.ar>
AuthorDate: Wed May 22 13:57:35 2013 +0000
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Wed May 22 23:42:44 2013 -0700

    net: ethernet: apple: drop unused variable
    
    Commit 3b0aaef ("net: ethernet: apple: initialize variables directly")
    dropped the only loop that was using i but did not remove the actual
    variable, therefore causing a warning when building. This patch drops
    the now redundant line.
    
    Signed-off-by: Emilio López <emilio< at >elopez.com.ar>
    Signed-off-by: David S. Miller <davem< at >davemloft.net>
---
 drivers/net/ethernet/apple/bmac.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index f36bbd6..8848190 100644
--- a/

powerpc/powernv: Build a zImage.epapr

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=83920c498ebb51cbd62f26f72e87c04a2a46dec9
Commit:     83920c498ebb51cbd62f26f72e87c04a2a46dec9
Parent:     b72c1f651491e4cd33ddec79c504a49071a512f0
Author:     Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
AuthorDate: Tue May 21 23:00:22 2013 +0000
Committer:  Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
CommitDate: Fri May 24 18:13:46 2013 +1000

    powerpc/powernv: Build a zImage.epapr
    
    The zImage.epapr wrapper allows to use zImages when booting via a flat
    device-tree which can be used on powernv.
    
    Signed-off-by: Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
---
 arch/powerpc/platforms/powernv/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig
index d3e840d..c24684c 100644
--- a/arch/powerpc/platforms/powernv/Kconfig
+++ b/arch/powerpc/platforms/powernv/Kconfig
< at >< at > -6,6 +6,7 < at >< at > config PPC_POWERNV
 select PPC_ICP_NA

powerpc/pseries: Make 32-bit MSI quirk work on systems lacking firmware support

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=f1dd153121dcb872ae6cba8d52bec97519eb7d97
Commit:     f1dd153121dcb872ae6cba8d52bec97519eb7d97
Parent:     83920c498ebb51cbd62f26f72e87c04a2a46dec9
Author:     Brian King <brking< at >linux.vnet.ibm.com>
AuthorDate: Wed May 22 11:07:46 2013 +0000
Committer:  Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
CommitDate: Fri May 24 18:16:54 2013 +1000

    powerpc/pseries: Make 32-bit MSI quirk work on systems lacking firmware support
    
    Recent commit e61133dda480062d221f09e4fc18f66763f8ecd0 added support
    for a new firmware feature to force an adapter to use 32 bit MSIs.
    However, this firmware is not available for all systems. The hack below
    allows devices needing 32 bit MSIs to work on these systems as well.
    It is careful to only enable this on Gen2 slots, which should limit
    this to configurations where this hack is needed and tested to work.
    
    [Small change to factor out the hack into a separate function -- BenH]
    
    Signed-o

net: fec: use a more proper compatible string for MVF type device

Linux Kernel Mailing List — 2013-05-24T16:03:22

Gitweb:     http://git.kernel.org/linus/;a=commit;h=3680354209dcdeb84671ad3740ef52ab754e05d0
Commit:     3680354209dcdeb84671ad3740ef52ab754e05d0
Parent:     147a90887baa98d73db1fa7ed9e755bf48960c21
Author:     Shawn Guo <shawn.guo< at >linaro.org>
AuthorDate: Sun May 19 04:38:46 2013 +0000
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Wed May 22 15:00:51 2013 -0700

    net: fec: use a more proper compatible string for MVF type device
    
    MVF is a family while MVF600 is a particular SoC in the family.  We
    generally prefer to use SoC rather than family name in compatible string
    to define a particular type of fec device.  And this is how fec_dt_ids
    works for all those IMX fec variants.  Let's change mvf to mvf600 to
    have it work in the same way.
    
    Signed-off-by: Shawn Guo <shawn.guo< at >linaro.org>
    Signed-off-by: David S. Miller <davem< at >davemloft.net>
---
 drivers/net/ethernet/freescale/fec_main.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git

powerpc/pci: Fix bogus message at boot about empty memory resources

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=bee7dd9c5fd5ab944e2e0ef3b92905fcbc993768
Commit:     bee7dd9c5fd5ab944e2e0ef3b92905fcbc993768
Parent:     8fc1f5d7eff9a4ed0cdb7215e7ca4b82b931d6d7
Author:     Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
AuthorDate: Mon May 20 17:24:39 2013 +0000
Committer:  Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
CommitDate: Fri May 24 18:13:44 2013 +1000

    powerpc/pci: Fix bogus message at boot about empty memory resources
    
    The message is only meant to be displayed if resource 0 is empty,
    but was displayed if any is.
    
    Signed-off-by: Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
---
 arch/powerpc/kernel/pci-common.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 6053f03..e9acf50 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
< at >< at > -1520,9 +1520,10 < at >< at > static void pcibios_setup_phb_resources(str

GFS2: Fix typo in gfs2_log_end_write loop

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=e97e548ba8baffe051146d1f5e897dec48da20e0
Commit:     e97e548ba8baffe051146d1f5e897dec48da20e0
Parent:     75f96ce6e754eee30d9ec788ad91c6ec21d0a46b
Author:     Steven Whitehouse <swhiteho< at >redhat.com>
AuthorDate: Tue May 21 12:49:07 2013 +0100
Committer:  Steven Whitehouse <swhiteho< at >redhat.com>
CommitDate: Fri May 24 13:48:09 2013 +0100

    GFS2: Fix typo in gfs2_log_end_write loop
    
    There was a missing _all in this loop iterator
    
    Signed-off-by: Steven Whitehouse <swhiteho< at >redhat.com>
---
 fs/gfs2/lops.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index c5fa758..68b4c8f 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
< at >< at > -212,7 +212,7 < at >< at > static void gfs2_end_log_write(struct bio *bio, int error)
 fs_err(sdp, "Error %d writing to log\n", error);
 }
 
-bio_for_each_segment(bvec, bio, i) {
+bio_for_each_segment_all(bvec, bio, i) {
 page = bvec->bv_page;
 if (page_has_buffers(p

GFS2: Use single-block reservations for directories

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=af21ca8ed50f01c5278c5ded6dad6f05e8a5d2e4
Commit:     af21ca8ed50f01c5278c5ded6dad6f05e8a5d2e4
Parent:     37f715774e2dd9ae521334dbbc3af63becd47adb
Author:     Bob Peterson <rpeterso< at >redhat.com>
AuthorDate: Tue May 14 13:04:29 2013 -0400
Committer:  Steven Whitehouse <swhiteho< at >redhat.com>
CommitDate: Fri May 24 13:47:32 2013 +0100

    GFS2: Use single-block reservations for directories
    
    This patch changes the multi-block allocation code, such that
    directory inodes only get a single block reserved in the bitmap.
    That way, the bitmaps are more tightly packed together, and there
    are fewer spans of free blocks for in-use block reservations.
    This means it takes less time to find a free span of blocks in the
    bitmap, which speeds things up. This increases the performance of
    some workloads by almost 2X. In Nate's mockup.py script (which does
    (1) create dir, (2) create dir in dir, (3) create file in that dir)
    the test executes

tcp: bug fix in proportional rate reduction.

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=35f079ebbc860dcd1cca70890c9c8d59c1145525
Commit:     35f079ebbc860dcd1cca70890c9c8d59c1145525
Parent:     d02cea0f4341b25cae044d2ec393049d60bff036
Author:     Nandita Dukkipati <nanditad< at >google.com>
AuthorDate: Tue May 21 15:12:07 2013 +0000
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Thu May 23 00:10:09 2013 -0700

    tcp: bug fix in proportional rate reduction.
    
    This patch is a fix for a bug triggering newly_acked_sacked < 0
    in tcp_ack(.).
    
    The bug is triggered by sacked_out decreasing relative to prior_sacked,
    but packets_out remaining the same as pior_packets. This is because the
    snapshot of prior_packets is taken after tcp_sacktag_write_queue() while
    prior_sacked is captured before tcp_sacktag_write_queue(). The problem
    is: tcp_sacktag_write_queue (tcp_match_skb_to_sack() -> tcp_fragment)
    adjusts the pcount for packets_out and sacked_out (MSS change or other
    reason). As a result, this delta

powerpc: Make radeon 32-bit MSI quirk work on powernv

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=b72c1f651491e4cd33ddec79c504a49071a512f0
Commit:     b72c1f651491e4cd33ddec79c504a49071a512f0
Parent:     59affcd3e460b97492bc1aa2b843bafe7c54f596
Author:     Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
AuthorDate: Tue May 21 22:58:21 2013 +0000
Committer:  Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
CommitDate: Fri May 24 18:13:45 2013 +1000

    powerpc: Make radeon 32-bit MSI quirk work on powernv
    
    This moves the quirk itself to pci_64.c as to get built on all ppc64
    platforms (the only ones with a pci_dn), factors the two implementations
    of get_pdn() into a single pci_get_dn() and use the quirk to do 32-bit
    MSIs on IODA based powernv platforms.
    
    Signed-off-by: Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
---
 arch/powerpc/include/asm/pci-bridge.h     |    2 +
 arch/powerpc/kernel/pci_64.c              |   10 ++++++++
 arch/powerpc/kernel/pci_dn.c              |    8 ++++++
 arch/powerpc/platforms/powernv/pci-i

drivers/crypto/nx: Fixes for multiple races and issues

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=1ad936e850a896bc16e0d72a56be432f9954ad7e
Commit:     1ad936e850a896bc16e0d72a56be432f9954ad7e
Parent:     519fe2ecb755b875d9814cdda19778c2e88c6901
Author:     Kent Yoder <key< at >linux.vnet.ibm.com>
AuthorDate: Fri Apr 12 17:13:59 2013 +0000
Committer:  Benjamin Herrenschmidt <benh< at >kernel.crashing.org>
CommitDate: Fri May 24 18:11:10 2013 +1000

    drivers/crypto/nx: Fixes for multiple races and issues
    
    Fixes a race on driver init with registering algorithms where the
    driver status flag wasn't being set before self testing started.
    
      Added the cra_alignmask field for CBC and ECB modes.
    
      Fixed a bug in GCM where AES block size was being used instead of
    authsize.
    
      Removed use of blkcipher_walk routines for scatterlist processing.
    Corner cases in the code prevent us from processing an entire
    scatterlist at a time and walking the buffers in block sized chunks
    turns out to be unecessary anyway.
    
      Fix

batman-adv: Avoid double freeing of bat_counters

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=f69ae770e74df420fbcf93aae81b30a5dcc73b7d
Commit:     f69ae770e74df420fbcf93aae81b30a5dcc73b7d
Parent:     3ccfc1b1d2fa78f8ece83646027982916fcc794b
Author:     Martin Hundebøll <martin< at >hundeboll.net>
AuthorDate: Wed Apr 17 21:13:16 2013 +0200
Committer:  Antonio Quartulli <ordex< at >autistici.org>
CommitDate: Tue May 21 21:34:36 2013 +0200

    batman-adv: Avoid double freeing of bat_counters
    
    On errors in batadv_mesh_init(), bat_counters will be freed in both
    batadv_mesh_free() and batadv_softif_init_late(). This patch fixes this
    by returning earlier from batadv_softif_init_late() in case of errors in
    batadv_mesh_init() and by setting bat_counters to NULL after freeing.
    
    Signed-off-by: Martin Hundebøll <martin< at >hundeboll.net>
    Signed-off-by: Marek Lindner <lindner_marek< at >yahoo.de>
    Signed-off-by: Antonio Quartulli <ordex< at >autistici.org>
---
 net/batman-adv/main.c           |    1 +
 net/batman-adv/soft-interface.c |    1 +
 2 fi

virtio_net: enable napi for all possible queues during open

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=e4166625edfd2d808ddda00c7e7e901f4f3b8cc0
Commit:     e4166625edfd2d808ddda00c7e7e901f4f3b8cc0
Parent:     35f079ebbc860dcd1cca70890c9c8d59c1145525
Author:     Jason Wang <jasowang< at >redhat.com>
AuthorDate: Tue May 21 20:03:58 2013 +0000
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Thu May 23 00:10:59 2013 -0700

    virtio_net: enable napi for all possible queues during open
    
    Commit 55257d72bd1c51f25106350f4983ec19f62ed1fa (virtio-net: fill only rx
    queues which are being used) only does the napi enabling during open for
    curr_queue_pairs. This will break multiqueue receiving since napi of new queues
    were still disabled after changing the number of queues.
    
    This patch fixes this by enabling napi for all possible queues during open.
    
    Cc: Sasha Levin <sasha.levin< at >oracle.com>
    Signed-off-by: Jason Wang <jasowang< at >redhat.com>
    Acked-by: Rusty Russell <rusty< at >rustcorp.com.au>
    Acked-by: Michael S. Tsirkin <

perf: net_dropmonitor: Fix trace parameter order

Linux Kernel Mailing List — 2013-05-24T16:03:22

Gitweb:     http://git.kernel.org/linus/;a=commit;h=140c3c6a2bcd2c31e2f7f5a8d59689724776c8e5
Commit:     140c3c6a2bcd2c31e2f7f5a8d59689724776c8e5
Parent:     3680354209dcdeb84671ad3740ef52ab754e05d0
Author:     Ben Hutchings <ben< at >decadent.org.uk>
AuthorDate: Mon May 20 14:44:43 2013 +0000
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Wed May 22 15:10:10 2013 -0700

    perf: net_dropmonitor: Fix trace parameter order
    
    This works much better if we don't treat protocol numbers as addresses.
    
    Cc: stable< at >vger.kernel.org
    Signed-off-by: Ben Hutchings <ben< at >decadent.org.uk>
    Signed-off-by: David S. Miller <davem< at >davemloft.net>
---
 tools/perf/scripts/python/net_dropmonitor.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py
index a4ffc95..adbfbf0 100755
--- a/tools/perf/scripts/python/net_dropmonitor.py
+++ b/tools/perf/scripts/python/net_dropmonitor.py
< at >< at > -64,7

be2net: bug fix on returning an invalid nic descriptor

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=950e2958a5e96406e6e5ff4190a638a54769f89b
Commit:     950e2958a5e96406e6e5ff4190a638a54769f89b
Parent:     547669d483e5783d722772af1483fa474da7caf9
Author:     Wei Yang <weiyang< at >linux.vnet.ibm.com>
AuthorDate: Wed May 22 15:58:22 2013 +0000
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Thu May 23 18:56:40 2013 -0700

    be2net: bug fix on returning an invalid nic descriptor
    
    In function be_get_nic_desc(), it will go through the descriptor array
    returned from f/w. By comparing the desc_type field, it determines whether
    there is a nic descriptor in the array or not. In the case of no nic
    descriptor, this function should return NULL.
    
    The code may return an invalide descriptor, when there is no nic descriptor
    in the array and the desc_count is less than MAX_RESOURCE_DESC. In this case,
    even there is no nic descriptor, it will still return the lase descriptor
    since the i doesn't equal to MAX_RESOURCE_DESC.

net: Revert unused variable changes.

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=7a1a0cbfeb31f20acc10722642198e76bbc30cb9
Commit:     7a1a0cbfeb31f20acc10722642198e76bbc30cb9
Parent:     497574c72c9922cf20c12aed15313c389f722fa0
Author:     David S. Miller <davem< at >davemloft.net>
AuthorDate: Thu May 23 12:15:32 2013 -0700
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Thu May 23 12:15:32 2013 -0700

    net: Revert unused variable changes.
    
    This reverts commits:
    
    c573972c111eb4c6b3f3250ad71e7c75cc799833
    1a5904342c7380ceddd61c0b37544d752d0b1433
    da2e2c214953f37c2a6be20226537ca5a329724c
    
    They were meant for net-next not net.
    
    Signed-off-by: David S. Miller <davem< at >davemloft.net>
---
 drivers/net/ethernet/apple/bmac.c  |    1 +
 drivers/net/ethernet/korina.c      |    1 +
 drivers/net/ethernet/sun/sunbmac.c |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index 8848190..f36bbd6 100644
--- a/drivers

GFS2: fix DLM depends to fix build errors

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=75f96ce6e754eee30d9ec788ad91c6ec21d0a46b
Commit:     75f96ce6e754eee30d9ec788ad91c6ec21d0a46b
Parent:     af21ca8ed50f01c5278c5ded6dad6f05e8a5d2e4
Author:     Randy Dunlap <rdunlap< at >infradead.org>
AuthorDate: Tue May 14 10:02:48 2013 -0700
Committer:  Steven Whitehouse <swhiteho< at >redhat.com>
CommitDate: Fri May 24 13:47:53 2013 +0100

    GFS2: fix DLM depends to fix build errors
    
    Fix build errors by correcting DLM dependencies in GFS2.
    Build errors happen when CONFIG_GFS2_FS_LOCKING_DLM=y and CONFIG_DLM=m:
    
    fs/built-in.o: In function `gfs2_lock':
    file.c:(.text+0xc7abd): undefined reference to `dlm_posix_get'
    file.c:(.text+0xc7ad0): undefined reference to `dlm_posix_unlock'
    file.c:(.text+0xc7ad9): undefined reference to `dlm_posix_lock'
    fs/built-in.o: In function `gdlm_unmount':
    lock_dlm.c:(.text+0xd6e5b): undefined reference to `dlm_release_lockspace'
    fs/built-in.o: In function `sync_unlock':
    lock_dlm.c:(.text+

tcp: xps: fix reordering issues

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=547669d483e5783d722772af1483fa474da7caf9
Commit:     547669d483e5783d722772af1483fa474da7caf9
Parent:     7a1a0cbfeb31f20acc10722642198e76bbc30cb9
Author:     Eric Dumazet <edumazet< at >google.com>
AuthorDate: Thu May 23 07:44:20 2013 +0000
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Thu May 23 18:29:20 2013 -0700

    tcp: xps: fix reordering issues
    
    commit 3853b5841c01a ("xps: Improvements in TX queue selection")
    introduced ooo_okay flag, but the condition to set it is slightly wrong.
    
    In our traces, we have seen ACK packets being received out of order,
    and RST packets sent in response.
    
    We should test if we have any packets still in host queue.
    
    Signed-off-by: Eric Dumazet <edumazet< at >google.com>
    Cc: Tom Herbert <therbert< at >google.com>
    Cc: Yuchung Cheng <ycheng< at >google.com>
    Cc: Neal Cardwell <ncardwell< at >google.com>
    Signed-off-by: David S. Miller <davem< at >davemloft.net>
---
 net/ipv4/tcp_output

perf: net_dropmonitor: Do not assume ordering of dictionaries

Linux Kernel Mailing List — 2013-05-24T16:03:22

Gitweb:     http://git.kernel.org/linus/;a=commit;h=326017c757e387007c6629797d7ae22fd33c1317
Commit:     326017c757e387007c6629797d7ae22fd33c1317
Parent:     5a1e99dd2028e00998d42029be86835d8ef4a46e
Author:     Ben Hutchings <ben< at >decadent.org.uk>
AuthorDate: Mon May 20 14:45:34 2013 +0000
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Wed May 22 15:10:10 2013 -0700

    perf: net_dropmonitor: Do not assume ordering of dictionaries
    
    The sort order of dictionaries in Python is undocumented.  Use
    tuples instead, which are documented to be lexically ordered.
    
    Signed-off-by: Ben Hutchings <ben< at >decadent.org.uk>
    Signed-off-by: David S. Miller <davem< at >davemloft.net>
---
 tools/perf/scripts/python/net_dropmonitor.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/perf/scripts/python/net_dropmonitor.py b/tools/perf/scripts/python/net_dropmonitor.py
index 4c11605..6acdc82 100755
--- a/tools/perf/scripts/python/net_dropmonitor.py
+++ b/tools/per

ath9k: fix rate handling/reporting

Linux Kernel Mailing List — 2013-05-24T16:03:22

Gitweb:     http://git.kernel.org/linus/;a=commit;h=0c585dda3574e40f562c362eaa326a98b1e49d02
Commit:     0c585dda3574e40f562c362eaa326a98b1e49d02
Parent:     16e23428024e4dc6b5ba5f6d36c57c49d33fe85b
Author:     Felix Fietkau <nbd< at >openwrt.org>
AuthorDate: Fri May 17 12:58:25 2013 +0200
Committer:  John W. Linville <linville< at >tuxdriver.com>
CommitDate: Fri May 17 14:31:08 2013 -0400

    ath9k: fix rate handling/reporting
    
    This patch fixes some issues introduced in the rate control API rework.
    When not running aggregation, copy bf->rates into info->control.rates
    before applying the rate control status to it.
    In ath_lookup_rate, the rates need to be pulled from bf->rates, not the
    tx info.
    
    Signed-off-by: Felix Fietkau <nbd< at >openwrt.org>
    Signed-off-by: John W. Linville <linville< at >tuxdriver.com>
---
 drivers/net/wireless/ath/ath9k/xmit.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath

xfrm: properly handle invalid states as an error

Linux Kernel Mailing List — 2013-05-24T16:03:23

Gitweb:     http://git.kernel.org/linus/;a=commit;h=497574c72c9922cf20c12aed15313c389f722fa0
Commit:     497574c72c9922cf20c12aed15313c389f722fa0
Parent:     e4166625edfd2d808ddda00c7e7e901f4f3b8cc0
Author:     Timo Teräs <timo.teras< at >iki.fi>
AuthorDate: Wed May 22 01:40:47 2013 +0000
Committer:  David S. Miller <davem< at >davemloft.net>
CommitDate: Thu May 23 01:20:07 2013 -0700

    xfrm: properly handle invalid states as an error
    
    The error exit path needs err explicitly set. Otherwise it
    returns success and the only caller, xfrm_output_resume(),
    would oops in skb_dst(skb)->ops derefence as skb_dst(skb) is
    NULL.
    
    Bug introduced in commit bb65a9cb (xfrm: removes a superfluous
    check and add a statistic).
    
    Signed-off-by: Timo Teräs <timo.teras< at >iki.fi>
    Cc: Li RongQing <roy.qing.li< at >gmail.com>
    Cc: Steffen Klassert <steffen.klassert< at >secunet.com>
    Signed-off-by: David S. Miller <davem< at >davemloft.net>
---
 net/xfrm/xfrm_output.c |    1 +
 1 files changed, 1 insertions