From aacb8252bf262eacf41adafb7e17bb8687eb9800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Mon, 16 Apr 2012 15:36:16 +0200
Subject: kernel, erts: Remove bit8 option from inet

---
 lib/kernel/doc/src/inet.xml            | 10 ----------
 lib/kernel/src/inet.erl                |  6 +++---
 lib/kernel/src/inet_int.hrl            |  7 -------
 lib/kernel/test/inet_sockopt_SUITE.erl |  2 --
 4 files changed, 3 insertions(+), 22 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 522a27dcfa..3dc54e24b7 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -446,16 +446,6 @@ fe80::204:acff:fe17:bf38
               faster than the receiver can read.</p>
           </item>
 
-		  <tag><c>{bit8, clear | set | on | off}</c></tag>
-		  <item>
-			  <p>
-				  Scans every byte in received data-packets and checks if the 8 bit
-				  is set in any of them. Information is retrieved with
-				  <c>inet:getopts/2</c>.
-				  <note>Deprecated! Will be removed in Erlang/OTP R16.</note>
-			  </p>
-		  </item>
-
           <tag><c>{broadcast, Boolean}</c>(UDP sockets)</tag>
           <item>
             <p>Enable/disable permission to send broadcasts.</p>
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
index abaf4486dc..b0a955fdcc 100644
--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
@@ -535,7 +535,7 @@ options() ->
      buffer, header, active, packet, deliver, mode,
      multicast_if, multicast_ttl, multicast_loop,
      exit_on_close, high_watermark, low_watermark,
-     bit8, send_timeout, send_timeout_close
+     send_timeout, send_timeout_close
     ].
 
 %% Return a list of statistics options
@@ -552,7 +552,7 @@ stats() ->
 connect_options() ->
     [tos, priority, reuseaddr, keepalive, linger, sndbuf, recbuf, nodelay,
      header, active, packet, packet_size, buffer, mode, deliver,
-     exit_on_close, high_watermark, low_watermark, bit8, send_timeout,
+     exit_on_close, high_watermark, low_watermark, send_timeout,
      send_timeout_close, delay_send,raw].
     
 connect_options(Opts, Family) ->
@@ -608,7 +608,7 @@ con_add(Name, Val, R, Opts, AllOpts) ->
 listen_options() ->
     [tos, priority, reuseaddr, keepalive, linger, sndbuf, recbuf, nodelay,
      header, active, packet, buffer, mode, deliver, backlog,
-     exit_on_close, high_watermark, low_watermark, bit8, send_timeout,
+     exit_on_close, high_watermark, low_watermark, send_timeout,
      send_timeout_close, delay_send, packet_size,raw].
 
 listen_options(Opts, Family) ->
diff --git a/lib/kernel/src/inet_int.hrl b/lib/kernel/src/inet_int.hrl
index cf893c73eb..467c4d5065 100644
--- a/lib/kernel/src/inet_int.hrl
+++ b/lib/kernel/src/inet_int.hrl
@@ -134,7 +134,6 @@
 -define(INET_LOPT_EXITONCLOSE,   26).
 -define(INET_LOPT_TCP_HIWTRMRK,  27).
 -define(INET_LOPT_TCP_LOWTRMRK,  28).
--define(INET_LOPT_BIT8,          29).
 -define(INET_LOPT_TCP_SEND_TIMEOUT, 30).
 -define(INET_LOPT_TCP_DELAY_SEND,   31).
 -define(INET_LOPT_PACKET_SIZE,   32).
@@ -186,12 +185,6 @@
 -define(TCP_PB_HTTP_BIN,13).
 -define(TCP_PB_HTTPH_BIN,14).
 
-%% bit options, INET_LOPT_BIT8
--define(INET_BIT8_CLEAR, 0).
--define(INET_BIT8_SET,   1).
--define(INET_BIT8_ON,    2).
--define(INET_BIT8_OFF,   3).
-
 
 %% getstat, INET_REQ_GETSTAT
 -define(INET_STAT_RECV_CNT,  1).
diff --git a/lib/kernel/test/inet_sockopt_SUITE.erl b/lib/kernel/test/inet_sockopt_SUITE.erl
index 0c63a6d653..087ae6055b 100644
--- a/lib/kernel/test/inet_sockopt_SUITE.erl
+++ b/lib/kernel/test/inet_sockopt_SUITE.erl
@@ -623,7 +623,6 @@ all_listen_options() ->
      {exit_on_close, true, false, true, true},
      %{high_watermark,4096,8192,true,true}, 
      %{low_watermark,2048,4096,true,true}, 
-     {bit8,on,off,true,true}, 
      {send_timeout,infinity,1000,true,true},
      {send_timeout_close,false,true,true,true},
      {delay_send,false,true,true,true}, 
@@ -647,7 +646,6 @@ all_connect_options() ->
      {exit_on_close, true, false, true, true},
      {high_watermark,4096,8192,false,true}, 
      {low_watermark,2048,4096,false,true}, 
-     {bit8,on,off,true,true}, 
      {send_timeout,infinity,1000,true,true},
      {send_timeout_close,false,true,true,true},
      {delay_send,false,true,true,true}, 
-- 
cgit v1.2.3