diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-05-06 21:19:14 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-05-06 21:19:14 +0000 |
commit | 0ff3c396d39e762cb0230eb84b9bd1d29dddc520 (patch) | |
tree | 25a23535641b48d2b83e90e007c977404cade1b7 /target/linux/generic/files/drivers | |
parent | c3f0b757a3bd952f8d85753cd975618a3008ab36 (diff) | |
download | mtk-20170518-0ff3c396d39e762cb0230eb84b9bd1d29dddc520.zip mtk-20170518-0ff3c396d39e762cb0230eb84b9bd1d29dddc520.tar.gz mtk-20170518-0ff3c396d39e762cb0230eb84b9bd1d29dddc520.tar.bz2 |
kernel: rewrite the phy packet hook, put it in the network stack to avoid having to keep non-upstream ethernet driver changes
SVN-Revision: 31637
Diffstat (limited to 'target/linux/generic/files/drivers')
-rw-r--r-- | target/linux/generic/files/drivers/net/phy/ar8216.c | 66 | ||||
-rw-r--r-- | target/linux/generic/files/drivers/net/phy/mvswitch.c | 74 |
2 files changed, 37 insertions, 103 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index da83a50..7a38d1f 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -221,8 +221,8 @@ ar8216_read_port_link(struct ar8216_priv *priv, int port, } } -static int -ar8216_mangle_tx(struct sk_buff *skb, struct net_device *dev) +static struct sk_buff * +ar8216_mangle_tx(struct net_device *dev, struct sk_buff *skb) { struct ar8216_priv *priv = dev->phy_ptr; unsigned char *buf; @@ -243,32 +243,27 @@ ar8216_mangle_tx(struct sk_buff *skb, struct net_device *dev) buf[1] = 0x80; send: - return priv->ndo_old->ndo_start_xmit(skb, dev); + return skb; error: dev_kfree_skb_any(skb); - return 0; + return NULL; } -static int -ar8216_mangle_rx(struct sk_buff *skb, int napi) +static void +ar8216_mangle_rx(struct net_device *dev, struct sk_buff *skb) { struct ar8216_priv *priv; - struct net_device *dev; unsigned char *buf; int port, vlan; - dev = skb->dev; - if (!dev) - goto error; - priv = dev->phy_ptr; if (!priv) - goto error; + return; /* don't strip the header if vlan mode is disabled */ if (!priv->vlan) - goto recv; + return; /* strip header, get vlan id */ buf = skb->data; @@ -276,13 +271,13 @@ ar8216_mangle_rx(struct sk_buff *skb, int napi) /* check for vlan header presence */ if ((buf[12 + 2] != 0x81) || (buf[13 + 2] != 0x00)) - goto recv; + return; port = buf[0] & 0xf; /* no need to fix up packets coming from a tagged source */ if (priv->vlan_tagged & (1 << port)) - goto recv; + return; /* lookup port vid from local table, the switch passes an invalid vlan id */ vlan = priv->vlan_id[priv->pvid[port]]; @@ -290,31 +285,6 @@ ar8216_mangle_rx(struct sk_buff *skb, int napi) buf[14 + 2] &= 0xf0; buf[14 + 2] |= vlan >> 8; buf[15 + 2] = vlan & 0xff; - -recv: - skb->protocol = eth_type_trans(skb, skb->dev); - - if (napi) - return netif_receive_skb(skb); - else - return netif_rx(skb); - -error: - /* no vlan? eat the packet! */ - dev_kfree_skb_any(skb); - return NET_RX_DROP; -} - -static int -ar8216_netif_rx(struct sk_buff *skb) -{ - return ar8216_mangle_rx(skb, 0); -} - -static int -ar8216_netif_receive_skb(struct sk_buff *skb) -{ - return ar8216_mangle_rx(skb, 1); } static int @@ -1356,13 +1326,9 @@ ar8216_config_init(struct phy_device *pdev) /* VID fixup only needed on ar8216 */ if (pdev->addr == 0 && priv->chip_type == AR8216) { - pdev->pkt_align = 2; - pdev->netif_receive_skb = ar8216_netif_receive_skb; - pdev->netif_rx = ar8216_netif_rx; - 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; + dev->priv_flags |= IFF_NO_IP_ALIGN; + dev->eth_mangle_rx = ar8216_mangle_rx; + dev->eth_mangle_tx = ar8216_mangle_tx; } priv->init = false; @@ -1443,8 +1409,10 @@ ar8216_remove(struct phy_device *pdev) if (!priv) return; - if (priv->ndo_old && dev) - dev->netdev_ops = priv->ndo_old; + dev->priv_flags &= ~IFF_NO_IP_ALIGN; + dev->eth_mangle_rx = NULL; + dev->eth_mangle_tx = NULL; + if (pdev->addr == 0) unregister_switch(&priv->dev); kfree(priv); diff --git a/target/linux/generic/files/drivers/net/phy/mvswitch.c b/target/linux/generic/files/drivers/net/phy/mvswitch.c index 1324a80..d754951 100644 --- a/target/linux/generic/files/drivers/net/phy/mvswitch.c +++ b/target/linux/generic/files/drivers/net/phy/mvswitch.c @@ -41,8 +41,7 @@ MODULE_LICENSE("GPL"); #define MVSWITCH_MAGIC 0x88E6060 struct mvswitch_priv { - const struct net_device_ops *ndo_old; - struct net_device_ops ndo; + netdev_features_t orig_features; u8 vlans[16]; }; @@ -61,8 +60,8 @@ w16(struct phy_device *phydev, int addr, int reg, u16 val) } -static int -mvswitch_mangle_tx(struct sk_buff *skb, struct net_device *dev) +static struct sk_buff * +mvswitch_mangle_tx(struct net_device *dev, struct sk_buff *skb) { struct mvswitch_priv *priv; char *buf = NULL; @@ -132,7 +131,7 @@ mvswitch_mangle_tx(struct sk_buff *skb, struct net_device *dev) )); #endif - return priv->ndo_old->ndo_start_xmit(skb, dev); + return skb; error_expand: if (net_ratelimit()) @@ -141,25 +140,20 @@ error_expand: error: /* any errors? drop the packet! */ dev_kfree_skb_any(skb); - return 0; + return NULL; } -static int -mvswitch_mangle_rx(struct sk_buff *skb, int napi) +static void +mvswitch_mangle_rx(struct net_device *dev, struct sk_buff *skb) { struct mvswitch_priv *priv; - struct net_device *dev; - int vlan = -1; unsigned char *buf; + int vlan = -1; int i; - dev = skb->dev; - if (!dev) - goto error; - priv = dev->phy_ptr; - if (!priv) - goto error; + if (WARN_ON_ONCE(!priv)) + return; #ifdef HEADER_MODE buf = skb->data; @@ -167,7 +161,7 @@ mvswitch_mangle_rx(struct sk_buff *skb, int napi) #else buf = skb->data + skb->len - MV_TRAILER_SIZE; if (buf[0] != 0x80) - goto error; + return; #endif /* look for the vlan matching the incoming port */ @@ -177,33 +171,9 @@ mvswitch_mangle_rx(struct sk_buff *skb, int napi) } if (vlan == -1) - goto error; - - skb->protocol = eth_type_trans(skb, skb->dev); + return; __vlan_hwaccel_put_tag(skb, vlan); - if (napi) - return netif_receive_skb(skb); - else - return netif_rx(skb); - -error: - /* no vlan? eat the packet! */ - dev_kfree_skb_any(skb); - return 0; -} - - -static int -mvswitch_netif_rx(struct sk_buff *skb) -{ - return mvswitch_mangle_rx(skb, 0); -} - -static int -mvswitch_netif_receive_skb(struct sk_buff *skb) -{ - return mvswitch_mangle_rx(skb, 1); } @@ -331,16 +301,12 @@ mvswitch_config_init(struct phy_device *pdev) MV_SWITCHCTL_DROP ); - /* 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; - dev->netdev_ops = &priv->ndo; + dev->eth_mangle_rx = mvswitch_mangle_rx; + dev->eth_mangle_tx = mvswitch_mangle_tx; + priv->orig_features = dev->features; - pdev->pkt_align = 2; - pdev->netif_receive_skb = mvswitch_netif_receive_skb; - pdev->netif_rx = mvswitch_netif_rx; #ifdef HEADER_MODE + dev->priv_flags |= IFF_NO_IP_ALIGN; dev->features |= NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX; #else dev->features |= NETIF_F_HW_VLAN_RX; @@ -387,11 +353,11 @@ mvswitch_remove(struct phy_device *pdev) struct mvswitch_priv *priv = to_mvsw(pdev); struct net_device *dev = pdev->attached_dev; - /* 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; + dev->eth_mangle_rx = NULL; + dev->eth_mangle_tx = NULL; + dev->features = priv->orig_features; + dev->priv_flags &= ~IFF_NO_IP_ALIGN; kfree(priv); } |