automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@32844 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 9eeeb36345a58634c9deef755d20ab5f62a7e3fa..a3640fa4f85cae99dceb43eba6c0277ad5333903 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -6426,9 +6426,9 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
                                                                        iax_frame_wrap(fr, &f);
 #ifdef BRIDGE_OPTIMIZATION
                                                                        if (iaxs[fr->callno]->bridgecallno) {
-                                                                               forward_delivery(&fr);
+                                                                               forward_delivery(fr);
                                                                        } else {
-                                                                               duped_fr = iaxfrdup2(&fr);
+                                                                               duped_fr = iaxfrdup2(fr);
                                                                                if (duped_fr) {
                                                                                        schedule_delivery(duped_fr, updatehistory, 1, &fr->ts);
                                                                                }
@@ -7627,9 +7627,9 @@ retryowner2:
        }
 #ifdef BRIDGE_OPTIMIZATION
        if (iaxs[fr->callno]->bridgecallno) {
-               forward_delivery(&fr);
+               forward_delivery(fr);
        } else {
-               duped_fr = iaxfrdup2(&fr);
+               duped_fr = iaxfrdup2(fr);
                if (duped_fr) {
                        schedule_delivery(duped_fr, updatehistory, 0, &fr->ts);
                }