From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
netdev@vger•kernel.org, Roland Dreier <roland@kernel•org>,
linux-rdma@vger•kernel.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Steve Wise <swise@opengridcomputing•com>,
Hariprasad Shenai <hariprasad@chelsio•com>
Subject: linux-next: manual merge of the net-next tree with Linus' tree
Date: Thu, 12 Jun 2014 12:01:46 +1000 [thread overview]
Message-ID: <20140612120146.74f55b1d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3727 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/infiniband/hw/cxgb4/cm.c between commits 11b8e22d4d09
("RDMA/cxgb4: Fix vlan support") and 9eccfe109b27 ("RDMA/cxgb4: Add
support for iWARP Port Mapper user space service") from Linus' tree and
commits 92e7ae71726c ("iw_cxgb4: Choose appropriate hw mtu index and
ISS for iWARP connections") and b408ff282dda ("iw_cxgb4: don't truncate
the recv window size") from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/infiniband/hw/cxgb4/cm.c
index 96d7131ab974,965eaafd5851..000000000000
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@@ -533,38 -532,17 +537,49 @@@ static int send_abort(struct c4iw_ep *e
return c4iw_l2t_send(&ep->com.dev->rdev, skb, ep->l2t);
}
+/*
+ * c4iw_form_pm_msg - Form a port mapper message with mapping info
+ */
+static void c4iw_form_pm_msg(struct c4iw_ep *ep,
+ struct iwpm_sa_data *pm_msg)
+{
+ memcpy(&pm_msg->loc_addr, &ep->com.local_addr,
+ sizeof(ep->com.local_addr));
+ memcpy(&pm_msg->rem_addr, &ep->com.remote_addr,
+ sizeof(ep->com.remote_addr));
+}
+
+/*
+ * c4iw_form_reg_msg - Form a port mapper message with dev info
+ */
+static void c4iw_form_reg_msg(struct c4iw_dev *dev,
+ struct iwpm_dev_data *pm_msg)
+{
+ memcpy(pm_msg->dev_name, dev->ibdev.name, IWPM_DEVNAME_SIZE);
+ memcpy(pm_msg->if_name, dev->rdev.lldi.ports[0]->name,
+ IWPM_IFNAME_SIZE);
+}
+
+static void c4iw_record_pm_msg(struct c4iw_ep *ep,
+ struct iwpm_sa_data *pm_msg)
+{
+ memcpy(&ep->com.mapped_local_addr, &pm_msg->mapped_loc_addr,
+ sizeof(ep->com.mapped_local_addr));
+ memcpy(&ep->com.mapped_remote_addr, &pm_msg->mapped_rem_addr,
+ sizeof(ep->com.mapped_remote_addr));
+}
+
+ static void best_mtu(const unsigned short *mtus, unsigned short mtu,
+ unsigned int *idx, int use_ts)
+ {
+ unsigned short hdr_size = sizeof(struct iphdr) +
+ sizeof(struct tcphdr) +
+ (use_ts ? 12 : 0);
+ unsigned short data_size = mtu - hdr_size;
+
+ cxgb4_best_aligned_mtu(mtus, hdr_size, data_size, 8, idx);
+ }
+
static int send_connect(struct c4iw_ep *ep)
{
struct cpl_act_open_req *req;
@@@ -583,14 -561,11 +598,15 @@@
int sizev6 = is_t4(ep->com.dev->rdev.lldi.adapter_type) ?
sizeof(struct cpl_act_open_req6) :
sizeof(struct cpl_t5_act_open_req6);
- struct sockaddr_in *la = (struct sockaddr_in *)&ep->com.local_addr;
- struct sockaddr_in *ra = (struct sockaddr_in *)&ep->com.remote_addr;
- struct sockaddr_in6 *la6 = (struct sockaddr_in6 *)&ep->com.local_addr;
- struct sockaddr_in6 *ra6 = (struct sockaddr_in6 *)&ep->com.remote_addr;
+ struct sockaddr_in *la = (struct sockaddr_in *)
+ &ep->com.mapped_local_addr;
+ struct sockaddr_in *ra = (struct sockaddr_in *)
+ &ep->com.mapped_remote_addr;
+ struct sockaddr_in6 *la6 = (struct sockaddr_in6 *)
+ &ep->com.mapped_local_addr;
+ struct sockaddr_in6 *ra6 = (struct sockaddr_in6 *)
+ &ep->com.mapped_remote_addr;
+ int win;
wrlen = (ep->com.remote_addr.ss_family == AF_INET) ?
roundup(sizev4, 16) :
@@@ -1796,7 -1821,8 +1862,8 @@@ static int import_ep(struct c4iw_ep *ep
step = cdev->rdev.lldi.nrxq /
cdev->rdev.lldi.nchan;
ep->rss_qid = cdev->rdev.lldi.rxq_ids[
- cxgb4_port_idx(n->dev) * step];
+ cxgb4_port_idx(pdev) * step];
+ set_tcp_window(ep, (struct port_info *)netdev_priv(pdev));
if (clear_mpa_v1) {
ep->retry_with_mpa_v1 = 0;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-06-12 2:01 UTC|newest]
Thread overview: 83+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 2:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-18 1:00 linux-next: manual merge of the net-next tree with Linus' tree Stephen Rothwell
2023-12-14 23:52 Stephen Rothwell
2023-02-16 23:40 Stephen Rothwell
2023-02-16 23:18 Stephen Rothwell
2022-10-27 23:28 Stephen Rothwell
2022-10-28 6:53 ` Marc Kleine-Budde
2022-09-21 1:00 Stephen Rothwell
2022-09-21 4:40 ` Colin Foster
2022-07-15 2:01 Stephen Rothwell
2022-07-15 1:48 Stephen Rothwell
2021-07-23 2:32 Stephen Rothwell
2021-01-29 0:59 Stephen Rothwell
2021-01-29 0:48 Stephen Rothwell
2021-01-29 0:43 Stephen Rothwell
2019-10-21 0:07 Stephen Rothwell
2019-09-15 20:31 Mark Brown
2019-09-15 20:24 Mark Brown
2019-06-17 1:44 Stephen Rothwell
2019-06-04 0:30 Stephen Rothwell
2019-06-04 0:29 Stephen Rothwell
2019-04-02 22:56 Stephen Rothwell
2018-07-20 1:49 Stephen Rothwell
2018-06-06 4:37 Stephen Rothwell
2017-12-04 22:59 Stephen Rothwell
2017-11-09 23:31 Stephen Rothwell
2017-11-10 4:37 ` Cong Wang
2017-11-10 4:39 ` David Miller
2017-10-30 17:24 Mark Brown
2017-10-30 17:08 Mark Brown
2017-10-30 17:02 Mark Brown
2017-10-30 17:43 ` Jakub Kicinski
2017-10-30 18:10 ` Mark Brown
2017-06-30 0:57 Stephen Rothwell
2017-05-03 1:07 Stephen Rothwell
2017-05-03 4:08 ` David Miller
2017-03-24 0:05 Stephen Rothwell
2017-03-24 0:10 ` David Miller
2017-03-24 1:24 ` Alexei Starovoitov
2017-02-02 1:49 Stephen Rothwell
2017-02-02 8:40 ` Yotam Gigi
2016-10-02 22:37 Stephen Rothwell
2016-10-02 22:32 Stephen Rothwell
2016-06-30 1:01 Stephen Rothwell
2016-05-03 3:15 Stephen Rothwell
2016-03-15 0:07 Stephen Rothwell
2016-03-15 8:53 ` Gregory CLEMENT
2015-07-14 1:46 Stephen Rothwell
2015-07-14 8:23 ` Nikolay Aleksandrov
2015-05-28 4:17 Stephen Rothwell
2015-05-28 13:34 ` Tom Lendacky
2015-02-12 1:05 Stephen Rothwell
2014-06-05 3:13 Stephen Rothwell
2014-06-05 3:26 ` KY Srinivasan
2013-12-18 1:46 Stephen Rothwell
2013-12-18 1:56 ` Jeff Kirsher
2013-12-18 2:19 ` Stephen Rothwell
2013-09-05 5:23 Stephen Rothwell
2013-09-05 5:19 Stephen Rothwell
2013-09-05 7:33 ` Daniel Borkmann
2013-09-02 3:12 Stephen Rothwell
2013-06-17 2:44 Stephen Rothwell
2013-06-17 2:38 Stephen Rothwell
2013-04-22 3:09 Stephen Rothwell
2013-04-23 0:42 ` David Miller
2013-04-22 3:03 Stephen Rothwell
2013-04-23 0:41 ` David Miller
2013-04-22 2:48 Stephen Rothwell
2013-04-22 2:43 Stephen Rothwell
2013-04-23 0:41 ` David Miller
2013-03-27 0:57 Stephen Rothwell
2013-03-27 4:54 ` David Miller
2013-03-12 0:33 Stephen Rothwell
2013-03-12 10:49 ` David Miller
2012-11-08 23:53 Stephen Rothwell
2012-11-10 23:34 ` David Miller
2012-10-02 1:51 Stephen Rothwell
2012-09-26 1:46 Stephen Rothwell
2012-07-19 1:15 Stephen Rothwell
2012-07-19 1:18 ` Jeff Kirsher
2012-02-27 1:11 Stephen Rothwell
2012-02-27 4:05 ` David Miller
2012-02-29 3:21 ` Ben Hutchings
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140612120146.74f55b1d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=hariprasad@chelsio$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-rdma@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=roland@kernel$(echo .)org \
--cc=swise@opengridcomputing$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox