Page MenuHomeFreeBSD
Files F148781366

D4875.id12177.diff
No OneTemporary
Actions

D4875.id12177.diff
View Options

Index: head/sys/dev/sfxge/common/efsys.h
===================================================================
--- head/sys/dev/sfxge/common/efsys.h
+++ head/sys/dev/sfxge/common/efsys.h
@@ -287,7 +287,6 @@
#define EFSYS_OPT_RX_SCALE 1
#define EFSYS_OPT_QSTATS 1
#define EFSYS_OPT_FILTER 1
-#define EFSYS_OPT_MCAST_FILTER_LIST 1
#define EFSYS_OPT_RX_SCATTER 0
#define EFSYS_OPT_RX_HDR_SPLIT 0
Index: head/sys/dev/sfxge/common/efx.h
===================================================================
--- head/sys/dev/sfxge/common/efx.h
+++ head/sys/dev/sfxge/common/efx.h
@@ -508,35 +508,10 @@
#define EFX_MAC_HASH_BITS (1 << 8)
extern __checkReturn efx_rc_t
-efx_pktfilter_init(
- __in efx_nic_t *enp);
-
-extern void
-efx_pktfilter_fini(
- __in efx_nic_t *enp);
-
-extern __checkReturn efx_rc_t
-efx_pktfilter_set(
- __in efx_nic_t *enp,
- __in boolean_t unicst,
- __in boolean_t brdcst);
-
-extern __checkReturn efx_rc_t
efx_mac_hash_set(
__in efx_nic_t *enp,
__in_ecount(EFX_MAC_HASH_BITS) unsigned int const *bucket);
-#if EFSYS_OPT_MCAST_FILTER_LIST
-extern __checkReturn efx_rc_t
-efx_pktfilter_mcast_list_set(
- __in efx_nic_t *enp,
- __in uint8_t const *addrs,
- __in int count);
-#endif /* EFSYS_OPT_MCAST_FILTER_LIST */
-
-extern __checkReturn efx_rc_t
-efx_pktfilter_mcast_all(
- __in efx_nic_t *enp);
#if EFSYS_OPT_MAC_STATS
Index: head/sys/dev/sfxge/common/efx_check.h
===================================================================
--- head/sys/dev/sfxge/common/efx_check.h
+++ head/sys/dev/sfxge/common/efx_check.h
@@ -397,12 +397,9 @@
# endif
#endif /* EFSYS_OPT_WOL */
-/* Support calculating multicast pktfilter in common code */
-#if EFSYS_OPT_MCAST_FILTER_LIST
-# if !(EFSYS_OPT_FALCON || EFSYS_OPT_SIENA || \
- EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
-# error "MCAST_FILTER_LIST requires FALCON or SIENA or HUNTINGTON or MEDFORD"
-# endif
+/* Obsolete option */
+#ifdef EFSYS_OPT_MCAST_FILTER_LIST
+# error "MCAST_FILTER_LIST is obsolete and not supported"
#endif /* EFSYS_OPT_MCAST_FILTER_LIST */
/* Support BIST */
Index: head/sys/dev/sfxge/common/efx_impl.h
===================================================================
--- head/sys/dev/sfxge/common/efx_impl.h
+++ head/sys/dev/sfxge/common/efx_impl.h
@@ -266,16 +266,6 @@
#endif /* EFSYS_OPT_FILTER */
-typedef struct efx_pktfilter_ops_s {
- efx_rc_t (*epfo_set)(efx_nic_t *,
- boolean_t unicst,
- boolean_t brdcast);
-#if EFSYS_OPT_MCAST_FILTER_LIST
- efx_rc_t (*epfo_mcast_list_set)(efx_nic_t *,
- uint8_t const *addrs, int count);
-#endif /* EFSYS_OPT_MCAST_FILTER_LIST */
- efx_rc_t (*epfo_mcast_all)(efx_nic_t *);
-} efx_pktfilter_ops_t;
typedef struct efx_port_s {
efx_mac_type_t ep_mac_type;
@@ -624,7 +614,6 @@
efx_filter_t en_filter;
efx_filter_ops_t *en_efop;
#endif /* EFSYS_OPT_FILTER */
- efx_pktfilter_ops_t *en_epfop;
#if EFSYS_OPT_MCDI
efx_mcdi_t en_mcdi;
#endif /* EFSYS_OPT_MCDI */
Index: head/sys/dev/sfxge/common/hunt_impl.h
===================================================================
--- head/sys/dev/sfxge/common/hunt_impl.h
+++ head/sys/dev/sfxge/common/hunt_impl.h
@@ -1008,26 +1008,6 @@
#endif /* EFSYS_OPT_FILTER */
extern __checkReturn efx_rc_t
-hunt_pktfilter_set(
- __in efx_nic_t *enp,
- __in boolean_t unicst,
- __in boolean_t brdcst);
-
-#if EFSYS_OPT_MCAST_FILTER_LIST
-
-extern __checkReturn efx_rc_t
-hunt_pktfilter_mcast_set(
- __in efx_nic_t *enp,
- __in uint8_t const *addrs,
- __in int count);
-
-#endif /* EFSYS_OPT_MCAST_FILTER_LIST */
-
-extern __checkReturn efx_rc_t
-hunt_pktfilter_mcast_all(
- __in efx_nic_t *enp);
-
-extern __checkReturn efx_rc_t
efx_mcdi_get_function_info(
__in efx_nic_t *enp,
__out uint32_t *pfp,

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 21, 4:53 AM (1 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30007699
Default Alt Text
D4875.id12177.diff (3 KB)

Event Timeline