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>

diff --git a/jme.c b/jme.c
index 140aef9483b30103dd0a710d962aa8c52885798b..3ac262f55633387d46947ca2d2c2259e1736867b 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -1056,16 +1056,12 @@ jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
                        skb_checksum_none_assert(skb);
 
                if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
                        skb_checksum_none_assert(skb);
 
                if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {

-                       if (jme->vlgrp) {
-                               jme->jme_vlan_rx(skb, jme->vlgrp,
-                                       le16_to_cpu(rxdesc->descwb.vlan));
-                               NET_STAT(jme).rx_bytes += 4;
-                       } else {
-                               dev_kfree_skb(skb);
-                       }
-               } else {
-                       jme->jme_rx(skb);
+                       u16 vid = le16_to_cpu(rxdesc->descwb.vlan);
+
+                       __vlan_hwaccel_put_tag(skb, vid);
+                       NET_STAT(jme).rx_bytes += 4;

                }
                }

+               jme->jme_rx(skb);

 
                if ((rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_DEST)) ==
                    cpu_to_le16(RXWBFLAG_DEST_MUL))
 
                if ((rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_DEST)) ==
                    cpu_to_le16(RXWBFLAG_DEST_MUL))


@@ -2289,16 +2285,6 @@ static inline void jme_resume_rx(struct jme_adapter *jme)
        atomic_inc(&jme->link_changing);
 }
 
        atomic_inc(&jme->link_changing);
 }
 

-static void
-jme_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
-{
-       struct jme_adapter *jme = netdev_priv(netdev);
-
-       jme_pause_rx(jme);
-       jme->vlgrp = grp;
-       jme_resume_rx(jme);
-}
-

 static void
 jme_get_drvinfo(struct net_device *netdev,
                     struct ethtool_drvinfo *info)
 static void
 jme_get_drvinfo(struct net_device *netdev,
                     struct ethtool_drvinfo *info)


@@ -2409,7 +2395,6 @@ jme_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd)
            test_bit(JME_FLAG_POLL, &jme->flags)) {
                clear_bit(JME_FLAG_POLL, &jme->flags);
                jme->jme_rx = netif_rx;
            test_bit(JME_FLAG_POLL, &jme->flags)) {
                clear_bit(JME_FLAG_POLL, &jme->flags);
                jme->jme_rx = netif_rx;

-               jme->jme_vlan_rx = vlan_hwaccel_rx;

                dpi->cur                = PCC_P1;
                dpi->attempt            = PCC_P1;
                dpi->cnt                = 0;
                dpi->cur                = PCC_P1;
                dpi->attempt            = PCC_P1;
                dpi->cnt                = 0;


@@ -2419,7 +2404,6 @@ jme_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *ecmd)
                   !(test_bit(JME_FLAG_POLL, &jme->flags))) {
                set_bit(JME_FLAG_POLL, &jme->flags);
                jme->jme_rx = netif_receive_skb;
                   !(test_bit(JME_FLAG_POLL, &jme->flags))) {
                set_bit(JME_FLAG_POLL, &jme->flags);
                jme->jme_rx = netif_receive_skb;

-               jme->jme_vlan_rx = vlan_hwaccel_receive_skb;

                jme_interrupt_mode(jme);
        }
 
                jme_interrupt_mode(jme);
        }
 


@@ -2858,7 +2842,6 @@ static const struct net_device_ops jme_netdev_ops = {
        .ndo_set_multicast_list = jme_set_multi,
        .ndo_change_mtu         = jme_change_mtu,
        .ndo_tx_timeout         = jme_tx_timeout,
        .ndo_set_multicast_list = jme_set_multi,
        .ndo_change_mtu         = jme_change_mtu,
        .ndo_tx_timeout         = jme_tx_timeout,

-       .ndo_vlan_rx_register   = jme_vlan_rx_register,

        .ndo_fix_features       = jme_fix_features,
        .ndo_set_features       = jme_set_features,
 };
        .ndo_fix_features       = jme_fix_features,
        .ndo_set_features       = jme_set_features,
 };


@@ -2941,7 +2924,6 @@ jme_init_one(struct pci_dev *pdev,
        jme->pdev = pdev;
        jme->dev = netdev;
        jme->jme_rx = netif_rx;
        jme->pdev = pdev;
        jme->dev = netdev;
        jme->jme_rx = netif_rx;

-       jme->jme_vlan_rx = vlan_hwaccel_rx;

        jme->old_mtu = netdev->mtu = 1500;
        jme->phylink = 0;
        jme->tx_ring_size = 1 << 10;
        jme->old_mtu = netdev->mtu = 1500;
        jme->phylink = 0;
        jme->tx_ring_size = 1 << 10;

diff --git a/jme.h b/jme.h
index 1481a62a1f363c1cef2aca41a18e651407848c60..c1f8b893e2ea4276d1b27c506cbff3fb97e3adc4 100644 (file)
--- a/jme.h
+++ b/jme.h
@@ -451,7 +451,6 @@ struct jme_adapter {
        u32                     msg_enable;
        struct ethtool_cmd      old_ecmd;
        unsigned int            old_mtu;
        u32                     msg_enable;
        struct ethtool_cmd      old_ecmd;
        unsigned int            old_mtu;

-       struct vlan_group       *vlgrp;

        struct dynpcc_info      dpi;
        atomic_t                intr_sem;
        atomic_t                link_changing;
        struct dynpcc_info      dpi;
        atomic_t                intr_sem;
        atomic_t                link_changing;


@@ -459,9 +458,6 @@ struct jme_adapter {
        atomic_t                rx_cleaning;
        atomic_t                rx_empty;
        int                     (*jme_rx)(struct sk_buff *skb);
        atomic_t                rx_cleaning;
        atomic_t                rx_empty;
        int                     (*jme_rx)(struct sk_buff *skb);

-       int                     (*jme_vlan_rx)(struct sk_buff *skb,
-                                         struct vlan_group *grp,
-                                         unsigned short vlan_tag);

        DECLARE_NAPI_STRUCT
        DECLARE_NET_DEVICE_STATS
 };
        DECLARE_NAPI_STRUCT
        DECLARE_NET_DEVICE_STATS
 };