aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorArun Murthy <arun.murthy@stericsson.com>2011-01-19 16:15:00 +0530
committerJonas ABERG <jonas.aberg@stericsson.com>2011-01-24 10:43:00 +0100
commit765a85e5a454b7af73043b43061db908bb4ee634 (patch)
tree7604dc1de84fe2104481e260672f9e00cf13c240 /net
parent9bb5617d62017ce063b2698457223b3eacaa56de (diff)
Revert "Phonet: Insert correct dest addr and port for TCP/IP data on U8500"
This reverts commit ebbc697c126846cc6e31512b4babbc8148e4315c. Change-Id: Id2c421a65661f141fa5c249f0a924d2b6fa59726 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/13147 Reviewed-by: QATOOLS Reviewed-by: Kumar A SANGHVI <kumar.sanghvi@stericsson.com> Reviewed-by: B Sampath KUMAR <sampath.kumar@stericsson.com> Tested-by: B Sampath KUMAR <sampath.kumar@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'net')
-rw-r--r--net/phonet/pep.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/net/phonet/pep.c b/net/phonet/pep.c
index c83fd337656..b2a3ae6cad7 100644
--- a/net/phonet/pep.c
+++ b/net/phonet/pep.c
@@ -50,7 +50,7 @@
#define CREDITS_MAX 10
#define CREDITS_THR 7
-static struct sockaddr_pn pipe_srv = {
+static const struct sockaddr_pn pipe_srv = {
.spn_family = AF_PHONET,
.spn_resource = 0xD9, /* pipe service */
};
@@ -852,23 +852,6 @@ static int pipe_skb_send(struct sock *sk, struct sk_buff *skb)
ph->message_id = PNS_PIPE_DATA;
ph->pipe_handle = pn->pipe_handle;
-#ifdef CONFIG_ARCH_U8500
- /*
- * FIXME:
- * Phonet stack by default sends all TCP/IP data to Pipe
- * controller, which it assumes to be present in modem.
- * Pipe controller then takes care of putting correct dest
- * address and port.
- *
- * U8500 modem does not implement Pipe controller so, insert
- * correct dest address and port here.
- * Ideally, it should be done by some implementation of Pipe
- * controller on APE side.
- */
- pipe_srv.spn_dev = 0x60;
- pipe_srv.spn_obj = 0x30;
-#endif
-
return pn_skb_send(sk, skb, &pipe_srv);
}