aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.h
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-07-20 00:54:19 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-21 16:47:55 -0400
commit87c288c6e9aa31720b72e2bc2d665e24e1653c3e (patch)
tree18706b96ee67715b400868da1da3a46fff5e596e /drivers/net/gianfar.h
parent6ede746b62627b6f03fe88afad1a07d38917b85d (diff)
gianfar: do vlan cleanup
- unify vlan and nonvlan rx path - kill priv->vlgrp and gfar_vlan_rx_register - allow to turn on/off rx/tx vlan accel via ethtool Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gianfar.h')
-rw-r--r--drivers/net/gianfar.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h
index 87c1d8608b73..9aa43773e8e3 100644
--- a/drivers/net/gianfar.h
+++ b/drivers/net/gianfar.h
@@ -1077,8 +1077,6 @@ struct gfar_private {
1077 1077
1078 struct sk_buff_head rx_recycle; 1078 struct sk_buff_head rx_recycle;
1079 1079
1080 struct vlan_group *vlgrp;
1081
1082 /* RX queue filer rule set*/ 1080 /* RX queue filer rule set*/
1083 struct ethtool_rx_list rx_list; 1081 struct ethtool_rx_list rx_list;
1084 struct mutex rx_queue_access; 1082 struct mutex rx_queue_access;
@@ -1183,6 +1181,7 @@ extern void gfar_configure_coalescing(struct gfar_private *priv,
1183void gfar_init_sysfs(struct net_device *dev); 1181void gfar_init_sysfs(struct net_device *dev);
1184int gfar_set_features(struct net_device *dev, u32 features); 1182int gfar_set_features(struct net_device *dev, u32 features);
1185extern void gfar_check_rx_parser_mode(struct gfar_private *priv); 1183extern void gfar_check_rx_parser_mode(struct gfar_private *priv);
1184extern void gfar_vlan_mode(struct net_device *dev, u32 features);
1186 1185
1187extern const struct ethtool_ops gfar_ethtool_ops; 1186extern const struct ethtool_ops gfar_ethtool_ops;
1188 1187