← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-vexpress/quantal

« back to all changes in this revision

Viewing changes to net/rds/loop.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, John Rigby
  • Date: 2011-03-18 07:36:33 UTC
  • mfrom: (5.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110318073633-tqfe9391ct71zb2p
Tags: 2.6.38-1001.2
https://launchpad.net/bugs/724377
https://launchpad.net/bugs/728603
https://launchpad.net/bugs/720055
https://launchpad.net/bugs/718677
https://launchpad.net/bugs/708883
https://launchpad.net/bugs/723159
https://launchpad.net/bugs/736429
[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38-rc6 -- same
  linaro-linux-2.6.38-upstream-1Mar2011 -- new
  Ubuntu-2.6.38-5.32 -- same
  - LP: #724377
* Enable CONFIG_THUMB2_KERNEL for OMAP[34]
* Bump ABI
* Rebase to new upstreams:
  Linux v2.6.38-rc7
  linaro-linux-2.6.38-upstream-4Mar2011
  ubuntu-natty master-next as of 4Mar2011
* Re-enable display on OMAP4
* Disable CONFIG_OMAP2_DSS_SDI
  - LP: #728603
  - LP: #720055
* Rebase to new upstreams:
  Linux v2.6.38-rc8
  linaro-linux-2.6.38-upstream-9Mar2011
    rebased to 2.6.38-rc8
* Remove generated file kernel-versions and sort kernel-versions.in
* Enable CONFIG_TIMER_STATS
  - LP: #718677
* Rebase to new upstreams:
  Linux v2.6.38 final
  linaro-linux-2.6.38-upstream-16Mar2011
  - LP: #708883
  - LP: #723159
  ubuntu-natty Ubuntu-2.6.38-7.35
* Enable CONFIG_IP_PNP and CONFIG_ROOT_NFS for all flavours
  - LP: #736429
* mach-ux500: fix build error
  workaround a problem in linux-linaro-2.6.38
* OMAP4:Fix -EINVAL for vana, vcxio, vdac
  from omap-linux mailing list pending ack
* turn off ROOT_NFS for mx51
  it makes the kernel too large to boot with current hwpack settings

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/rds/loop.c
61
61
                         unsigned int hdr_off, unsigned int sg,
62
62
                         unsigned int off)
63
63
{
 
64
        struct scatterlist *sgp = &rm->data.op_sg[sg];
 
65
        int ret = sizeof(struct rds_header) +
 
66
                        be32_to_cpu(rm->m_inc.i_hdr.h_len);
 
67
 
64
68
        /* Do not send cong updates to loopback */
65
69
        if (rm->m_inc.i_hdr.h_flags & RDS_FLAG_CONG_BITMAP) {
66
70
                rds_cong_map_updated(conn->c_fcong, ~(u64) 0);
67
 
                return sizeof(struct rds_header) + RDS_CONG_MAP_BYTES;
 
71
                ret = min_t(int, ret, sgp->length - conn->c_xmit_data_off);
 
72
                goto out;
68
73
        }
69
74
 
70
75
        BUG_ON(hdr_off || sg || off);
80
85
                            NULL);
81
86
 
82
87
        rds_inc_put(&rm->m_inc);
83
 
 
84
 
        return sizeof(struct rds_header) + be32_to_cpu(rm->m_inc.i_hdr.h_len);
 
88
out:
 
89
        return ret;
85
90
}
86
91
 
87
92
/*