diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-07-20 00:54:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-21 16:47:55 -0400 |
commit | 5043f5057773ba8b539eb51b9a4007e99599824f (patch) | |
tree | 006f66ba49915e10cb0bc374752e0a8beefb00bd /drivers/net/jme.h | |
parent | a0f1d603ee4186081fda0ad48ccf6163c2009f10 (diff) |
jme: do vlan cleanup
- unify vlan and nonvlan rx path
- kill jme->vlgrp and jme_vlan_rx_register
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.h')
-rw-r--r-- | drivers/net/jme.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/jme.h b/drivers/net/jme.h index 1481a62a1f36..c1f8b893e2ea 100644 --- a/drivers/net/jme.h +++ b/drivers/net/jme.h | |||
@@ -451,7 +451,6 @@ struct jme_adapter { | |||
451 | u32 msg_enable; | 451 | u32 msg_enable; |
452 | struct ethtool_cmd old_ecmd; | 452 | struct ethtool_cmd old_ecmd; |
453 | unsigned int old_mtu; | 453 | unsigned int old_mtu; |
454 | struct vlan_group *vlgrp; | ||
455 | struct dynpcc_info dpi; | 454 | struct dynpcc_info dpi; |
456 | atomic_t intr_sem; | 455 | atomic_t intr_sem; |
457 | atomic_t link_changing; | 456 | atomic_t link_changing; |
@@ -459,9 +458,6 @@ struct jme_adapter { | |||
459 | atomic_t rx_cleaning; | 458 | atomic_t rx_cleaning; |
460 | atomic_t rx_empty; | 459 | atomic_t rx_empty; |
461 | int (*jme_rx)(struct sk_buff *skb); | 460 | int (*jme_rx)(struct sk_buff *skb); |
462 | int (*jme_vlan_rx)(struct sk_buff *skb, | ||
463 | struct vlan_group *grp, | ||
464 | unsigned short vlan_tag); | ||
465 | DECLARE_NAPI_STRUCT | 461 | DECLARE_NAPI_STRUCT |
466 | DECLARE_NET_DEVICE_STATS | 462 | DECLARE_NET_DEVICE_STATS |
467 | }; | 463 | }; |