From 88194ec500f363a209311c0ead652e43a531366a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 16 Sep 2009 12:24:46 +0000 Subject: move the updated version (for 2.6.30+) of ar8216/mvswitch to the generic files directory and remove patches for older kernel versions (no longer in use) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17594 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic-2.6/files/drivers/net/phy/ar8216.c | 20 ++++++++++------- .../generic-2.6/files/drivers/net/phy/mvswitch.c | 26 +++++++++++++--------- 2 files changed, 27 insertions(+), 19 deletions(-) (limited to 'target/linux/generic-2.6/files') diff --git a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c b/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c index 3100b92de1..93e4b33d94 100644 --- a/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic-2.6/files/drivers/net/phy/ar8216.c @@ -33,12 +33,12 @@ struct ar8216_priv { - int (*hardstart)(struct sk_buff *skb, struct net_device *dev); - struct switch_dev dev; struct phy_device *phy; u32 (*read)(struct ar8216_priv *priv, int reg); void (*write)(struct ar8216_priv *priv, int reg, u32 val); + const struct net_device_ops *ndo_old; + struct net_device_ops ndo; /* all fields below are cleared on reset */ bool vlan; @@ -186,7 +186,7 @@ ar8216_mangle_tx(struct sk_buff *skb, struct net_device *dev) buf[1] = 0x80; send: - return priv->hardstart(skb, dev); + return priv->ndo_old->ndo_start_xmit(skb, dev); error: dev_kfree_skb_any(skb); @@ -439,7 +439,8 @@ ar8216_hw_apply(struct switch_dev *dev) AR8216_PORT_CTRL_SINGLE_VLAN | AR8216_PORT_CTRL_STATE | AR8216_PORT_CTRL_HEADER | AR8216_PORT_CTRL_LEARN_LOCK, AR8216_PORT_CTRL_LEARN | - (i == AR8216_PORT_CPU ? AR8216_PORT_CTRL_HEADER : 0) | + (priv->vlan && i == AR8216_PORT_CPU ? + AR8216_PORT_CTRL_HEADER : 0) | (egress << AR8216_PORT_CTRL_VLAN_MODE_S) | (AR8216_PORT_STATE_FORWARD << AR8216_PORT_CTRL_STATE_S)); @@ -526,10 +527,13 @@ ar8216_config_init(struct phy_device *pdev) dev->phy_ptr = priv; pdev->pkt_align = 2; - priv->hardstart = dev->hard_start_xmit; pdev->netif_receive_skb = ar8216_netif_receive_skb; pdev->netif_rx = ar8216_netif_rx; - dev->hard_start_xmit = ar8216_mangle_tx; + + priv->ndo_old = dev->netdev_ops; + memcpy(&priv->ndo, priv->ndo_old, sizeof(struct net_device_ops)); + priv->ndo.ndo_start_xmit = ar8216_mangle_tx; + dev->netdev_ops = &priv->ndo; done: return ret; @@ -586,8 +590,8 @@ ar8216_remove(struct phy_device *pdev) if (!priv) return; - if (priv->hardstart && dev) - dev->hard_start_xmit = priv->hardstart; + if (priv->ndo_old && dev) + dev->netdev_ops = priv->ndo_old; unregister_switch(&priv->dev); kfree(priv); } diff --git a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c index b98699e174..3ae8899c2a 100644 --- a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c +++ b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c @@ -41,8 +41,8 @@ MODULE_LICENSE("GPL"); #define MVSWITCH_MAGIC 0x88E6060 struct mvswitch_priv { - /* the driver's tx function */ - int (*hardstart)(struct sk_buff *skb, struct net_device *dev); + const struct net_device_ops *ndo_old; + struct net_device_ops ndo; struct vlan_group *grp; u8 vlans[16]; }; @@ -133,7 +133,7 @@ mvswitch_mangle_tx(struct sk_buff *skb, struct net_device *dev) )); #endif - return priv->hardstart(skb, dev); + return priv->ndo_old->ndo_start_xmit(skb, dev); error_expand: if (net_ratelimit()) @@ -248,6 +248,9 @@ mvswitch_config_init(struct phy_device *pdev) pdev->advertising = ADVERTISED_100baseT_Full; dev->phy_ptr = priv; dev->irq = PHY_POLL; +#ifdef HEADER_MODE + dev->flags |= IFF_PROMISC; +#endif /* initialize default vlans */ for (i = 0; i < MV_PORTS; i++) @@ -340,12 +343,15 @@ mvswitch_config_init(struct phy_device *pdev) ); /* hook into the tx function */ + priv->ndo_old = dev->netdev_ops; + memcpy(&priv->ndo, priv->ndo_old, sizeof(struct net_device_ops)); + priv->ndo.ndo_start_xmit = mvswitch_mangle_tx; + priv->ndo.ndo_vlan_rx_register = mvswitch_vlan_rx_register; + dev->netdev_ops = &priv->ndo; + pdev->pkt_align = 2; - priv->hardstart = dev->hard_start_xmit; pdev->netif_receive_skb = mvswitch_netif_receive_skb; pdev->netif_rx = mvswitch_netif_rx; - dev->hard_start_xmit = mvswitch_mangle_tx; - dev->vlan_rx_register = mvswitch_vlan_rx_register; #ifdef HEADER_MODE dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX; #else @@ -393,11 +399,9 @@ mvswitch_remove(struct phy_device *pdev) struct mvswitch_priv *priv = to_mvsw(pdev); struct net_device *dev = pdev->attached_dev; - /* restore old xmit handler */ - if (priv->hardstart && dev) - dev->hard_start_xmit = priv->hardstart; - dev->vlan_rx_register = NULL; - dev->vlan_rx_kill_vid = NULL; + /* restore old netdev ops */ + if (priv->ndo_old && dev) + dev->netdev_ops = priv->ndo_old; dev->phy_ptr = NULL; dev->features &= ~NETIF_F_HW_VLAN_RX; kfree(priv); -- cgit v1.2.3