diff options
| author | Arun Murthy <arun.murthy@stericsson.com> | 2011-01-19 16:14:20 +0530 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-01-24 10:42:46 +0100 |
| commit | 9bb5617d62017ce063b2698457223b3eacaa56de (patch) | |
| tree | e373d96c12e31bf2be20559435f7bd2d1a2e785c /net | |
| parent | c5e52b37fd6483a1917dd8d1db1ddcf1f045bb59 (diff) | |
Revert "Phonet: Fix bug for Pep Disconnect request"
This reverts commit f80745aaacb70e220450999ea7392b54c892778b.
Conflicts:
net/phonet/pep.c
Change-Id: Iad4cccd5a53c0689423bd57d6b9d9f3b8a5a19ed
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/13146
Reviewed-by: B Sampath KUMAR <sampath.kumar@stericsson.com>
Tested-by: B Sampath KUMAR <sampath.kumar@stericsson.com>
Reviewed-by: QATOOLS
Reviewed-by: Kumar A SANGHVI <kumar.sanghvi@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/phonet/pep.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 777ee283f9f..c83fd337656 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c @@ -834,7 +834,6 @@ static int pipe_skb_send(struct sock *sk, struct sk_buff *skb) { struct pep_sock *pn = pep_sk(sk); struct pnpipehdr *ph; - int ret; if (pn_flow_safe(pn->tx_fc) && !atomic_add_unless(&pn->tx_credits, -1, 0)) { @@ -863,9 +862,6 @@ static int pipe_skb_send(struct sock *sk, struct sk_buff *skb) * * U8500 modem does not implement Pipe controller so, insert * correct dest address and port here. - * Dest device address for modem = 0x60 - * Dest port number for modem = 0x30 - * * Ideally, it should be done by some implementation of Pipe * controller on APE side. */ @@ -873,21 +869,7 @@ static int pipe_skb_send(struct sock *sk, struct sk_buff *skb) pipe_srv.spn_obj = 0x30; #endif - ret = pn_skb_send(sk, skb, &pipe_srv); - if (ret && pn_flow_safe(pn->tx_fc)) - atomic_inc(&pn->tx_credits); - -#ifdef CONFIG_ARCH_U8500 - /* restore the original values. - * This is required because we are modifying dest address - * and port number, which will not work out correct for rest - * of Phonet stack. - */ - pipe_srv.spn_dev = 0x0; - pipe_srv.spn_obj = 0x0; -#endif - - return ret; + return pn_skb_send(sk, skb, &pipe_srv); } static int pep_sendmsg(struct kiocb *iocb, struct sock *sk, |