From: Jeff Peeler <jpeeler@digium.com>
Date: Fri, 29 Oct 2010 21:50:18 +0000 (+0000)
Subject: Merged revisions 293305 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a491f69be66104dc76530ba4de0052ed6b264dcb;p=thirdparty%2Fasterisk.git

Merged revisions 293305 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293305 | jpeeler | 2010-10-29 16:48:38 -0500 (Fri, 29 Oct 2010) | 9 lines

  Modify sip_setoption to not complain about unknown options.

  This now behaves just like the other setoption callbacks. For the curious the
  offending option for the reporter was AST_OPTION_CHANNEL_WRITE which was getting
  passed due to a fix for chan_local in 286189.

  (closes issue #17985)
  Reported by: globalnetinc
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 00713d5e62..a53fe4a1d3 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4065,7 +4065,6 @@ static int sip_setoption(struct ast_channel *chan, int option, void *data, int d
 		res = 0;
 		break;
 	default:
-		ast_log(LOG_NOTICE, "Unknown option: %d\n", option);
 		break;
 	}