Commit 261688d0 authored by David S. Miller's avatar David S. Miller
Browse files

[PKT_SCHED]: em_meta: Kill TCF_META_ID_{INDEV,SECURITY,TCVERDICT} 



More unusable TCF_META_* match types that need to get eliminated
before 2.6.13 goes out the door.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
parent d3984a6b

include/linux/tc_ematch/tc_em_meta.h

+0 −3
Original line number Diff line number Diff line
@@ -41,17 +41,14 @@ enum 
	TCF_META_ID_LOADAVG_1,

	TCF_META_ID_LOADAVG_2,

	TCF_META_ID_DEV,

	TCF_META_ID_INDEV,

	TCF_META_ID_PRIORITY,

	TCF_META_ID_PROTOCOL,

	TCF_META_ID_SECURITY, /* obsolete */

	TCF_META_ID_PKTTYPE,

	TCF_META_ID_PKTLEN,

	TCF_META_ID_DATALEN,

	TCF_META_ID_MACLEN,

	TCF_META_ID_NFMARK,

	TCF_META_ID_TCINDEX,

	TCF_META_ID_TCVERDICT,

	TCF_META_ID_RTCLASSID,

	TCF_META_ID_RTIIF,

	TCF_META_ID_SK_FAMILY,

net/sched/em_meta.c

+3 −25
Original line number Diff line number Diff line
@@ -27,17 +27,17 @@ 
 * 	         lvalue                                   rvalue

 * 	      +-----------+                           +-----------+

 * 	      | type: INT |                           | type: INT |

 * 	 def  | id: INDEV |                           | id: VALUE |

 * 	 def  | id: DEV   |                           | id: VALUE |

 * 	      | data:     |                           | data: 3   |

 * 	      +-----------+                           +-----------+

 * 	            |                                       |

 * 	            ---> meta_ops[INT][INDEV](...)          |

 * 	            ---> meta_ops[INT][DEV](...)            |

 *	                      |                             |

 * 	            -----------                             |

 * 	            V                                       V

 * 	      +-----------+                           +-----------+

 * 	      | type: INT |                           | type: INT |

 * 	 obj  | id: INDEV |                           | id: VALUE |

 * 	 obj  | id: DEV |                             | id: VALUE |

 * 	      | data: 2   |<--data got filled out     | data: 3   |

 * 	      +-----------+                           +-----------+

 * 	            |                                         |
@@ -170,16 +170,6 @@ META_COLLECTOR(var_dev) 
	*err = var_dev(skb->dev, dst);

}



META_COLLECTOR(int_indev)

{

	*err = int_dev(skb->input_dev, dst);

}



META_COLLECTOR(var_indev)

{

	*err = var_dev(skb->input_dev, dst);

}



/**************************************************************************

 * skb attributes

 **************************************************************************/
@@ -235,13 +225,6 @@ META_COLLECTOR(int_tcindex) 
	dst->value = skb->tc_index;

}



#ifdef CONFIG_NET_CLS_ACT

META_COLLECTOR(int_tcverd)

{

	dst->value = skb->tc_verd;

}

#endif



/**************************************************************************

 * Routing

 **************************************************************************/
@@ -490,7 +473,6 @@ struct meta_ops 
static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = {

	[TCF_META_TYPE_VAR] = {

		[META_ID(DEV)]			= META_FUNC(var_dev),

		[META_ID(INDEV)]		= META_FUNC(var_indev),

		[META_ID(SK_BOUND_IF)] 		= META_FUNC(var_sk_bound_if),

	},

	[TCF_META_TYPE_INT] = {
@@ -499,7 +481,6 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = { 
		[META_ID(LOADAVG_1)]		= META_FUNC(int_loadavg_1),

		[META_ID(LOADAVG_2)]		= META_FUNC(int_loadavg_2),

		[META_ID(DEV)]			= META_FUNC(int_dev),

		[META_ID(INDEV)]		= META_FUNC(int_indev),

		[META_ID(PRIORITY)]		= META_FUNC(int_priority),

		[META_ID(PROTOCOL)]		= META_FUNC(int_protocol),

		[META_ID(PKTTYPE)]		= META_FUNC(int_pkttype),
@@ -510,9 +491,6 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = { 
		[META_ID(NFMARK)]		= META_FUNC(int_nfmark),

#endif

		[META_ID(TCINDEX)]		= META_FUNC(int_tcindex),

#ifdef CONFIG_NET_CLS_ACT

		[META_ID(TCVERDICT)]		= META_FUNC(int_tcverd),

#endif

#ifdef CONFIG_NET_CLS_ROUTE

		[META_ID(RTCLASSID)]		= META_FUNC(int_rtclassid),

#endif