ATM: Remove A_LLC and A_CALLREFTYPE.

Since commit 7818d4e in 2014 "llc" is not an ATM-only keyword and A_LLC
is never assigned; A_CALLREFTYPE was introduced in commit 243b20e in
2002 and was never assigned.  The associated case blocks are dead code.

diff --git a/gencode.c b/gencode.c
index a9fe859b52d1d79f0fdffa3540ac03a10344c131..1bcf5e215529ae6bb67ed7a90219bdff85a2e0ca 100644 (file)
--- a/gencode.c
+++ b/gencode.c
@@ -10149,15 +10149,6 @@ gen_atmfield_code_internal(compiler_state_t *cstate, int atmfield,
                    0xffffffffU, jtype, reverse, jvalue);
                break;
 
-       case A_CALLREFTYPE:
-               if (!cstate->is_atm)
-                       bpf_error(cstate, "'callref' supported only on raw ATM");
-               if (cstate->off_proto == OFFSET_NOT_SET)
-                       abort();
-               b0 = gen_ncmp(cstate, OR_LINKHDR, cstate->off_proto, BPF_B,
-                   0xffffffffU, jtype, reverse, jvalue);
-               break;
-
        default:
                abort();
        }
@@ -10298,13 +10289,6 @@ gen_atmtype_abbrev(compiler_state_t *cstate, int type)
                cstate->off_nl_nosnap = 3;              /* 802.3+802.2 */
                break;
 
-       case A_LLC:
-               /* Get all LLC-encapsulated packets */
-               if (!cstate->is_atm)
-                       bpf_error(cstate, "'llc' supported only on raw ATM");
-               b1 = gen_atmtype_llc(cstate);
-               break;
-
        default:
                abort();
        }

diff --git a/gencode.h b/gencode.h
index 22752ed1aabfe19cbeaf99bf722eff51c324227d..7e7d499e4412b10d9dde6c7c803e5a744b5887e0 100644 (file)
--- a/gencode.h
+++ b/gencode.h
@@ -160,7 +160,6 @@
 #define A_OAM          28      /* OAM cells : F4 only */
 #define A_OAMF4                29      /* OAM F4 cells: Segment + End-to-end */
 #define A_LANE         30      /* LANE traffic */
-#define A_LLC          31      /* LLC-encapsulated traffic */
 
 /* Based on Q.2931 signalling protocol */
 #define A_SETUP                41      /* Setup message */
@@ -175,7 +174,6 @@
 #define A_VCI          52
 #define A_PROTOTYPE    53
 #define A_MSGTYPE      54
-#define A_CALLREFTYPE  55
 
 #define A_CONNECTMSG   70      /* returns Q.2931 signalling messages for
                                   establishing and destroying switched