diff options
Diffstat (limited to 'target/linux/generic')
29 files changed, 392 insertions, 238 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); } diff --git a/target/linux/generic/patches-3.2/721-phy_packets.patch b/target/linux/generic/patches-3.2/721-phy_packets.patch index 68471ee..147b4cc 100644 --- a/target/linux/generic/patches-3.2/721-phy_packets.patch +++ b/target/linux/generic/patches-3.2/721-phy_packets.patch @@ -1,63 +1,167 @@ ---- a/drivers/net/phy/phy_device.c -+++ b/drivers/net/phy/phy_device.c -@@ -149,6 +149,18 @@ int phy_scan_fixups(struct phy_device *p - } - EXPORT_SYMBOL(phy_scan_fixups); +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -1103,6 +1103,11 @@ struct net_device { + const struct net_device_ops *netdev_ops; + const struct ethtool_ops *ethtool_ops; -+static int generic_receive_skb(struct sk_buff *skb) -+{ -+ skb->protocol = eth_type_trans(skb, skb->dev); -+ return netif_receive_skb(skb); -+} ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb); ++ struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb); ++#endif + -+static int generic_rx(struct sk_buff *skb) -+{ -+ skb->protocol = eth_type_trans(skb, skb->dev); -+ return netif_rx(skb); -+} -+ - static struct phy_device* phy_device_create(struct mii_bus *bus, - int addr, int phy_id) - { -@@ -180,6 +192,8 @@ static struct phy_device* phy_device_cre - dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr); - - dev->state = PHY_DOWN; -+ dev->netif_receive_skb = &generic_receive_skb; -+ dev->netif_rx = &generic_rx; - - mutex_init(&dev->lock); - INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine); ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -334,6 +334,20 @@ struct phy_device { - void (*adjust_link)(struct net_device *dev); - - void (*adjust_state)(struct net_device *dev); -+ -+ /* -+ * By default these point to the original functions -+ * with the same name. adding them to the phy_device -+ * allows the phy driver to override them for packet -+ * mangling if the ethernet driver supports it -+ * This is required to support some really horrible -+ * switches such as the Marvell 88E6060 -+ */ -+ int (*netif_receive_skb)(struct sk_buff *skb); -+ int (*netif_rx)(struct sk_buff *skb); -+ -+ /* alignment offset for packets */ -+ int pkt_align; - }; - #define to_phy_device(d) container_of(d, struct phy_device, dev) + /* Hardware header description */ + const struct header_ops *header_ops; ---- a/include/linux/netdevice.h -+++ b/include/linux/netdevice.h -@@ -1158,6 +1158,7 @@ struct net_device { +@@ -1158,6 +1163,9 @@ struct net_device { void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, assign before registering */ ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE + void *phy_ptr; /* PHY device specific data */ ++#endif /* * Cache lines mostly used on receive path (including eth_type_trans()) +--- a/include/linux/if.h ++++ b/include/linux/if.h +@@ -79,6 +79,7 @@ + #define IFF_TX_SKB_SHARING 0x10000 /* The interface supports sharing + * skbs on transmit */ + #define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */ ++#define IFF_NO_IP_ALIGN 0x40000 /* do not ip-align allocated rx pkts */ + + #define IF_GET_IFACE 0x0001 /* for querying only */ + #define IF_GET_PROTO 0x0002 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -1636,6 +1636,10 @@ extern struct sk_buff *dev_alloc_skb(uns + extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev, + unsigned int length, gfp_t gfp_mask); + ++extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, ++ unsigned int length, gfp_t gfp); ++ ++ + /** + * netdev_alloc_skb - allocate an skbuff for rx on a specific device + * @dev: network device to receive on +@@ -1655,16 +1659,6 @@ static inline struct sk_buff *netdev_all + return __netdev_alloc_skb(dev, length, GFP_ATOMIC); + } + +-static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, +- unsigned int length, gfp_t gfp) +-{ +- struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); +- +- if (NET_IP_ALIGN && skb) +- skb_reserve(skb, NET_IP_ALIGN); +- return skb; +-} +- + static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, + unsigned int length) + { +--- a/net/Kconfig ++++ b/net/Kconfig +@@ -23,6 +23,12 @@ menuconfig NET + + if NET + ++config ETHERNET_PACKET_MANGLE ++ bool ++ help ++ This option can be selected by phy drivers that need to mangle ++ packets going in or out of an ethernet device. ++ + config WANT_COMPAT_NETLINK_MESSAGES + bool + help +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -2224,9 +2224,19 @@ int dev_hard_start_xmit(struct sk_buff * + } + } + +- skb_len = skb->len; +- rc = ops->ndo_start_xmit(skb, dev); +- trace_net_dev_xmit(skb, rc, dev, skb_len); ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ if (!dev->eth_mangle_tx || ++ (skb = dev->eth_mangle_tx(dev, skb)) != NULL) ++#else ++ if (1) ++#endif ++ { ++ skb_len = skb->len; ++ rc = ops->ndo_start_xmit(skb, dev); ++ trace_net_dev_xmit(skb, rc, dev, skb_len); ++ } else { ++ rc = NETDEV_TX_OK; ++ } + if (rc == NETDEV_TX_OK) + txq_trans_update(txq); + return rc; +@@ -2246,9 +2256,19 @@ gso: + if (dev->priv_flags & IFF_XMIT_DST_RELEASE) + skb_dst_drop(nskb); + +- skb_len = nskb->len; +- rc = ops->ndo_start_xmit(nskb, dev); +- trace_net_dev_xmit(nskb, rc, dev, skb_len); ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ if (!dev->eth_mangle_tx || ++ (nskb = dev->eth_mangle_tx(dev, nskb)) != NULL) ++#else ++ if (1) ++#endif ++ { ++ skb_len = nskb->len; ++ rc = ops->ndo_start_xmit(nskb, dev); ++ trace_net_dev_xmit(nskb, rc, dev, skb_len); ++ } else { ++ rc = NETDEV_TX_OK; ++ } + if (unlikely(rc != NETDEV_TX_OK)) { + if (rc & ~NETDEV_TX_MASK) + goto out_kfree_gso_skb; +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c +@@ -271,6 +271,22 @@ struct sk_buff *__netdev_alloc_skb(struc + } + EXPORT_SYMBOL(__netdev_alloc_skb); + ++struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, ++ unsigned int length, gfp_t gfp) ++{ ++ struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); ++ ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ if (dev->priv_flags & IFF_NO_IP_ALIGN) ++ return skb; ++#endif ++ ++ if (NET_IP_ALIGN && skb) ++ skb_reserve(skb, NET_IP_ALIGN); ++ return skb; ++} ++EXPORT_SYMBOL(__netdev_alloc_skb_ip_align); ++ + void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off, + int size) + { +--- a/net/ethernet/eth.c ++++ b/net/ethernet/eth.c +@@ -160,6 +160,12 @@ __be16 eth_type_trans(struct sk_buff *sk + struct ethhdr *eth; + + skb->dev = dev; ++ ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ if (dev->eth_mangle_rx) ++ dev->eth_mangle_rx(dev, skb); ++#endif ++ + skb_reset_mac_header(skb); + skb_pull_inline(skb, ETH_HLEN); + eth = eth_hdr(skb); diff --git a/target/linux/generic/patches-3.2/722-phy_mvswitch.patch b/target/linux/generic/patches-3.2/722-phy_mvswitch.patch index 8b5bac2..8a45611 100644 --- a/target/linux/generic/patches-3.2/722-phy_mvswitch.patch +++ b/target/linux/generic/patches-3.2/722-phy_mvswitch.patch @@ -1,11 +1,12 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -113,6 +113,9 @@ config ADM6996_PHY +@@ -113,6 +113,10 @@ config ADM6996_PHY Currently supports the ADM6996FC and ADM6996M switches. Support for FC is very limited. +config MVSWITCH_PHY + tristate "Driver for Marvell 88E6060 switches" ++ select ETHERNET_PACKET_MANGLE + config FIXED_PHY bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" diff --git a/target/linux/generic/patches-3.2/723-phy_ip175c.patch b/target/linux/generic/patches-3.2/723-phy_ip175c.patch index 05b9619..8eff10c 100644 --- a/target/linux/generic/patches-3.2/723-phy_ip175c.patch +++ b/target/linux/generic/patches-3.2/723-phy_ip175c.patch @@ -1,8 +1,8 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -116,6 +116,10 @@ config ADM6996_PHY - config MVSWITCH_PHY +@@ -117,6 +117,10 @@ config MVSWITCH_PHY tristate "Driver for Marvell 88E6060 switches" + select ETHERNET_PACKET_MANGLE +config IP17XX_PHY + tristate "Driver for IC+ IP17xx switches" diff --git a/target/linux/generic/patches-3.2/724-phy_ar8216.patch b/target/linux/generic/patches-3.2/724-phy_ar8216.patch index 79169db..eed6e2b 100644 --- a/target/linux/generic/patches-3.2/724-phy_ar8216.patch +++ b/target/linux/generic/patches-3.2/724-phy_ar8216.patch @@ -1,11 +1,12 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -120,6 +120,10 @@ config IP17XX_PHY +@@ -121,6 +121,11 @@ config IP17XX_PHY tristate "Driver for IC+ IP17xx switches" select SWCONFIG +config AR8216_PHY + tristate "Driver for Atheros AR8216 switches" ++ select ETHERNET_PACKET_MANGLE + select SWCONFIG + config FIXED_PHY diff --git a/target/linux/generic/patches-3.2/725-phy_rtl8306.patch b/target/linux/generic/patches-3.2/725-phy_rtl8306.patch index e243afe..db0ee65 100644 --- a/target/linux/generic/patches-3.2/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-3.2/725-phy_rtl8306.patch @@ -1,7 +1,7 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -124,6 +124,10 @@ config AR8216_PHY - tristate "Driver for Atheros AR8216 switches" +@@ -126,6 +126,10 @@ config AR8216_PHY + select ETHERNET_PACKET_MANGLE select SWCONFIG +config RTL8306_PHY diff --git a/target/linux/generic/patches-3.2/726-phy_rtl8366.patch b/target/linux/generic/patches-3.2/726-phy_rtl8366.patch index ee636ee..49cd970 100644 --- a/target/linux/generic/patches-3.2/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-3.2/726-phy_rtl8366.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -166,4 +166,29 @@ config MDIO_OCTEON +@@ -168,4 +168,29 @@ config MDIO_OCTEON If in doubt, say Y. diff --git a/target/linux/generic/patches-3.2/727-phy-rtl8367.patch b/target/linux/generic/patches-3.2/727-phy-rtl8367.patch index ca8ccdf..3af6101 100644 --- a/target/linux/generic/patches-3.2/727-phy-rtl8367.patch +++ b/target/linux/generic/patches-3.2/727-phy-rtl8367.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -183,6 +183,10 @@ config RTL8366RB_PHY +@@ -185,6 +185,10 @@ config RTL8366RB_PHY tristate "Driver for the Realtek RTL8366RB switch" select SWCONFIG diff --git a/target/linux/generic/patches-3.2/728-phy-micrel.patch b/target/linux/generic/patches-3.2/728-phy-micrel.patch index 8272ba7..c41d030 100644 --- a/target/linux/generic/patches-3.2/728-phy-micrel.patch +++ b/target/linux/generic/patches-3.2/728-phy-micrel.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -128,6 +128,11 @@ config RTL8306_PHY +@@ -130,6 +130,11 @@ config RTL8306_PHY tristate "Driver for Realtek RTL8306S switches" select SWCONFIG diff --git a/target/linux/generic/patches-3.2/750-hostap_txpower.patch b/target/linux/generic/patches-3.2/750-hostap_txpower.patch index 8e2ec9a..a928bcd 100644 --- a/target/linux/generic/patches-3.2/750-hostap_txpower.patch +++ b/target/linux/generic/patches-3.2/750-hostap_txpower.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c -@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t +@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t addr[count].sa_family = ARPHRD_ETHER; memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); if (sta->last_rx_silence == 0) diff --git a/target/linux/generic/patches-3.2/830-ledtrig_morse.patch b/target/linux/generic/patches-3.2/830-ledtrig_morse.patch index e91e93a..6c0da82 100644 --- a/target/linux/generic/patches-3.2/830-ledtrig_morse.patch +++ b/target/linux/generic/patches-3.2/830-ledtrig_morse.patch @@ -11,7 +11,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -54,3 +54,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += +@@ -54,3 +54,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o diff --git a/target/linux/generic/patches-3.2/831-ledtrig_netdev.patch b/target/linux/generic/patches-3.2/831-ledtrig_netdev.patch index 8be6dab..ed635d2 100644 --- a/target/linux/generic/patches-3.2/831-ledtrig_netdev.patch +++ b/target/linux/generic/patches-3.2/831-ledtrig_netdev.patch @@ -14,7 +14,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -55,3 +55,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += +@@ -55,3 +55,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o diff --git a/target/linux/generic/patches-3.2/941-ocf_20110720.patch b/target/linux/generic/patches-3.2/941-ocf_20110720.patch index 36bf5aa..177883c 100644 --- a/target/linux/generic/patches-3.2/941-ocf_20110720.patch +++ b/target/linux/generic/patches-3.2/941-ocf_20110720.patch @@ -34,7 +34,7 @@ * All of these routines try to estimate how many bits of randomness a * particular randomness source. They do this by keeping track of the * first and second order deltas of the event timings. -@@ -722,6 +732,63 @@ void add_disk_randomness(struct gendisk +@@ -722,6 +732,63 @@ void add_disk_randomness(struct gendisk } #endif diff --git a/target/linux/generic/patches-3.2/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/target/linux/generic/patches-3.2/992-mpcore_wdt_fix_watchdog_counter_loading.patch index 090e63c..0cae123 100644 --- a/target/linux/generic/patches-3.2/992-mpcore_wdt_fix_watchdog_counter_loading.patch +++ b/target/linux/generic/patches-3.2/992-mpcore_wdt_fix_watchdog_counter_loading.patch @@ -51,7 +51,7 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> +EXPORT_SYMBOL_GPL(twd_timer_get_rate); --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c -@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct +@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct spin_lock(&wdt_lock); /* Assume prescale is set to 256 */ diff --git a/target/linux/generic/patches-3.3/721-phy_packets.patch b/target/linux/generic/patches-3.3/721-phy_packets.patch index e566371..8efd21a 100644 --- a/target/linux/generic/patches-3.3/721-phy_packets.patch +++ b/target/linux/generic/patches-3.3/721-phy_packets.patch @@ -1,63 +1,175 @@ ---- a/drivers/net/phy/phy_device.c -+++ b/drivers/net/phy/phy_device.c -@@ -149,6 +149,18 @@ int phy_scan_fixups(struct phy_device *p - } - EXPORT_SYMBOL(phy_scan_fixups); +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -1078,6 +1078,11 @@ struct net_device { + const struct net_device_ops *netdev_ops; + const struct ethtool_ops *ethtool_ops; -+static int generic_receive_skb(struct sk_buff *skb) -+{ -+ skb->protocol = eth_type_trans(skb, skb->dev); -+ return netif_receive_skb(skb); -+} ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ void (*eth_mangle_rx)(struct net_device *dev, struct sk_buff *skb); ++ struct sk_buff *(*eth_mangle_tx)(struct net_device *dev, struct sk_buff *skb); ++#endif + -+static int generic_rx(struct sk_buff *skb) -+{ -+ skb->protocol = eth_type_trans(skb, skb->dev); -+ return netif_rx(skb); -+} -+ - static struct phy_device* phy_device_create(struct mii_bus *bus, - int addr, int phy_id) - { -@@ -180,6 +192,8 @@ static struct phy_device* phy_device_cre - dev_set_name(&dev->dev, PHY_ID_FMT, bus->id, addr); - - dev->state = PHY_DOWN; -+ dev->netif_receive_skb = &generic_receive_skb; -+ dev->netif_rx = &generic_rx; - - mutex_init(&dev->lock); - INIT_DELAYED_WORK(&dev->state_queue, phy_state_machine); ---- a/include/linux/phy.h -+++ b/include/linux/phy.h -@@ -339,6 +339,20 @@ struct phy_device { - void (*adjust_link)(struct net_device *dev); - - void (*adjust_state)(struct net_device *dev); -+ -+ /* -+ * By default these point to the original functions -+ * with the same name. adding them to the phy_device -+ * allows the phy driver to override them for packet -+ * mangling if the ethernet driver supports it -+ * This is required to support some really horrible -+ * switches such as the Marvell 88E6060 -+ */ -+ int (*netif_receive_skb)(struct sk_buff *skb); -+ int (*netif_rx)(struct sk_buff *skb); -+ -+ /* alignment offset for packets */ -+ int pkt_align; - }; - #define to_phy_device(d) container_of(d, struct phy_device, dev) + /* Hardware header description */ + const struct header_ops *header_ops; ---- a/include/linux/netdevice.h -+++ b/include/linux/netdevice.h -@@ -1134,6 +1134,7 @@ struct net_device { +@@ -1134,6 +1139,9 @@ struct net_device { void *ax25_ptr; /* AX.25 specific data */ struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data, assign before registering */ ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE + void *phy_ptr; /* PHY device specific data */ ++#endif /* * Cache lines mostly used on receive path (including eth_type_trans()) +--- a/include/linux/if.h ++++ b/include/linux/if.h +@@ -80,6 +80,7 @@ + * skbs on transmit */ + #define IFF_UNICAST_FLT 0x20000 /* Supports unicast filtering */ + #define IFF_TEAM_PORT 0x40000 /* device used as team port */ ++#define IFF_NO_IP_ALIGN 0x80000 /* do not ip-align allocated rx pkts */ + + #define IF_GET_IFACE 0x0001 /* for querying only */ + #define IF_GET_PROTO 0x0002 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -1661,6 +1661,10 @@ extern struct sk_buff *dev_alloc_skb(uns + extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev, + unsigned int length, gfp_t gfp_mask); + ++extern struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, ++ unsigned int length, gfp_t gfp); ++ ++ + /** + * netdev_alloc_skb - allocate an skbuff for rx on a specific device + * @dev: network device to receive on +@@ -1680,16 +1684,6 @@ static inline struct sk_buff *netdev_all + return __netdev_alloc_skb(dev, length, GFP_ATOMIC); + } + +-static inline struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, +- unsigned int length, gfp_t gfp) +-{ +- struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); +- +- if (NET_IP_ALIGN && skb) +- skb_reserve(skb, NET_IP_ALIGN); +- return skb; +-} +- + static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, + unsigned int length) + { +--- a/net/Kconfig ++++ b/net/Kconfig +@@ -23,6 +23,12 @@ menuconfig NET + + if NET + ++config ETHERNET_PACKET_MANGLE ++ bool ++ help ++ This option can be selected by phy drivers that need to mangle ++ packets going in or out of an ethernet device. ++ + config WANT_COMPAT_NETLINK_MESSAGES + bool + help +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -2246,9 +2246,19 @@ int dev_hard_start_xmit(struct sk_buff * + } + } + +- skb_len = skb->len; +- rc = ops->ndo_start_xmit(skb, dev); +- trace_net_dev_xmit(skb, rc, dev, skb_len); ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ if (!dev->eth_mangle_tx || ++ (skb = dev->eth_mangle_tx(dev, skb)) != NULL) ++#else ++ if (1) ++#endif ++ { ++ skb_len = skb->len; ++ rc = ops->ndo_start_xmit(skb, dev); ++ trace_net_dev_xmit(skb, rc, dev, skb_len); ++ } else { ++ rc = NETDEV_TX_OK; ++ } + if (rc == NETDEV_TX_OK) + txq_trans_update(txq); + return rc; +@@ -2268,9 +2278,19 @@ gso: + if (dev->priv_flags & IFF_XMIT_DST_RELEASE) + skb_dst_drop(nskb); + +- skb_len = nskb->len; +- rc = ops->ndo_start_xmit(nskb, dev); +- trace_net_dev_xmit(nskb, rc, dev, skb_len); ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ if (!dev->eth_mangle_tx || ++ (nskb = dev->eth_mangle_tx(dev, nskb)) != NULL) ++#else ++ if (1) ++#endif ++ { ++ skb_len = nskb->len; ++ rc = ops->ndo_start_xmit(nskb, dev); ++ trace_net_dev_xmit(nskb, rc, dev, skb_len); ++ } else { ++ rc = NETDEV_TX_OK; ++ } + if (unlikely(rc != NETDEV_TX_OK)) { + if (rc & ~NETDEV_TX_MASK) + goto out_kfree_gso_skb; +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c +@@ -58,6 +58,7 @@ + #include <linux/scatterlist.h> + #include <linux/errqueue.h> + #include <linux/prefetch.h> ++#include <linux/if.h> + + #include <net/protocol.h> + #include <net/dst.h> +@@ -320,6 +321,22 @@ struct sk_buff *__netdev_alloc_skb(struc + } + EXPORT_SYMBOL(__netdev_alloc_skb); + ++struct sk_buff *__netdev_alloc_skb_ip_align(struct net_device *dev, ++ unsigned int length, gfp_t gfp) ++{ ++ struct sk_buff *skb = __netdev_alloc_skb(dev, length + NET_IP_ALIGN, gfp); ++ ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ if (dev->priv_flags & IFF_NO_IP_ALIGN) ++ return skb; ++#endif ++ ++ if (NET_IP_ALIGN && skb) ++ skb_reserve(skb, NET_IP_ALIGN); ++ return skb; ++} ++EXPORT_SYMBOL(__netdev_alloc_skb_ip_align); ++ + void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off, + int size) + { +--- a/net/ethernet/eth.c ++++ b/net/ethernet/eth.c +@@ -160,6 +160,12 @@ __be16 eth_type_trans(struct sk_buff *sk + struct ethhdr *eth; + + skb->dev = dev; ++ ++#ifdef CONFIG_ETHERNET_PACKET_MANGLE ++ if (dev->eth_mangle_rx) ++ dev->eth_mangle_rx(dev, skb); ++#endif ++ + skb_reset_mac_header(skb); + skb_pull_inline(skb, ETH_HLEN); + eth = eth_hdr(skb); diff --git a/target/linux/generic/patches-3.3/722-phy_mvswitch.patch b/target/linux/generic/patches-3.3/722-phy_mvswitch.patch index 8b5bac2..8a45611 100644 --- a/target/linux/generic/patches-3.3/722-phy_mvswitch.patch +++ b/target/linux/generic/patches-3.3/722-phy_mvswitch.patch @@ -1,11 +1,12 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -113,6 +113,9 @@ config ADM6996_PHY +@@ -113,6 +113,10 @@ config ADM6996_PHY Currently supports the ADM6996FC and ADM6996M switches. Support for FC is very limited. +config MVSWITCH_PHY + tristate "Driver for Marvell 88E6060 switches" ++ select ETHERNET_PACKET_MANGLE + config FIXED_PHY bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs" diff --git a/target/linux/generic/patches-3.3/723-phy_ip175c.patch b/target/linux/generic/patches-3.3/723-phy_ip175c.patch index 05b9619..8eff10c 100644 --- a/target/linux/generic/patches-3.3/723-phy_ip175c.patch +++ b/target/linux/generic/patches-3.3/723-phy_ip175c.patch @@ -1,8 +1,8 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -116,6 +116,10 @@ config ADM6996_PHY - config MVSWITCH_PHY +@@ -117,6 +117,10 @@ config MVSWITCH_PHY tristate "Driver for Marvell 88E6060 switches" + select ETHERNET_PACKET_MANGLE +config IP17XX_PHY + tristate "Driver for IC+ IP17xx switches" diff --git a/target/linux/generic/patches-3.3/724-phy_ar8216.patch b/target/linux/generic/patches-3.3/724-phy_ar8216.patch index 79169db..eed6e2b 100644 --- a/target/linux/generic/patches-3.3/724-phy_ar8216.patch +++ b/target/linux/generic/patches-3.3/724-phy_ar8216.patch @@ -1,11 +1,12 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -120,6 +120,10 @@ config IP17XX_PHY +@@ -121,6 +121,11 @@ config IP17XX_PHY tristate "Driver for IC+ IP17xx switches" select SWCONFIG +config AR8216_PHY + tristate "Driver for Atheros AR8216 switches" ++ select ETHERNET_PACKET_MANGLE + select SWCONFIG + config FIXED_PHY diff --git a/target/linux/generic/patches-3.3/725-phy_rtl8306.patch b/target/linux/generic/patches-3.3/725-phy_rtl8306.patch index e243afe..db0ee65 100644 --- a/target/linux/generic/patches-3.3/725-phy_rtl8306.patch +++ b/target/linux/generic/patches-3.3/725-phy_rtl8306.patch @@ -1,7 +1,7 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -124,6 +124,10 @@ config AR8216_PHY - tristate "Driver for Atheros AR8216 switches" +@@ -126,6 +126,10 @@ config AR8216_PHY + select ETHERNET_PACKET_MANGLE select SWCONFIG +config RTL8306_PHY diff --git a/target/linux/generic/patches-3.3/726-phy_rtl8366.patch b/target/linux/generic/patches-3.3/726-phy_rtl8366.patch index 190b28f..fee8b78 100644 --- a/target/linux/generic/patches-3.3/726-phy_rtl8366.patch +++ b/target/linux/generic/patches-3.3/726-phy_rtl8366.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -166,6 +166,31 @@ config MDIO_OCTEON +@@ -168,6 +168,31 @@ config MDIO_OCTEON If in doubt, say Y. diff --git a/target/linux/generic/patches-3.3/727-phy-rtl8367.patch b/target/linux/generic/patches-3.3/727-phy-rtl8367.patch index ca8ccdf..3af6101 100644 --- a/target/linux/generic/patches-3.3/727-phy-rtl8367.patch +++ b/target/linux/generic/patches-3.3/727-phy-rtl8367.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -183,6 +183,10 @@ config RTL8366RB_PHY +@@ -185,6 +185,10 @@ config RTL8366RB_PHY tristate "Driver for the Realtek RTL8366RB switch" select SWCONFIG diff --git a/target/linux/generic/patches-3.3/728-phy-micrel.patch b/target/linux/generic/patches-3.3/728-phy-micrel.patch index 8272ba7..c41d030 100644 --- a/target/linux/generic/patches-3.3/728-phy-micrel.patch +++ b/target/linux/generic/patches-3.3/728-phy-micrel.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -128,6 +128,11 @@ config RTL8306_PHY +@@ -130,6 +130,11 @@ config RTL8306_PHY tristate "Driver for Realtek RTL8306S switches" select SWCONFIG diff --git a/target/linux/generic/patches-3.3/750-hostap_txpower.patch b/target/linux/generic/patches-3.3/750-hostap_txpower.patch index 8e2ec9a..a928bcd 100644 --- a/target/linux/generic/patches-3.3/750-hostap_txpower.patch +++ b/target/linux/generic/patches-3.3/750-hostap_txpower.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c -@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t +@@ -2340,13 +2340,13 @@ int prism2_ap_get_sta_qual(local_info_t addr[count].sa_family = ARPHRD_ETHER; memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); if (sta->last_rx_silence == 0) diff --git a/target/linux/generic/patches-3.3/830-ledtrig_morse.patch b/target/linux/generic/patches-3.3/830-ledtrig_morse.patch index 3283807..47db802 100644 --- a/target/linux/generic/patches-3.3/830-ledtrig_morse.patch +++ b/target/linux/generic/patches-3.3/830-ledtrig_morse.patch @@ -11,7 +11,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -57,3 +57,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += +@@ -57,3 +57,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += ledtrig-backlight.o obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o diff --git a/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch b/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch index 7f94b1c..161db1a 100644 --- a/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch +++ b/target/linux/generic/patches-3.3/831-ledtrig_netdev.patch @@ -14,7 +14,7 @@ endif # NEW_LEDS --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile -@@ -58,3 +58,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += +@@ -58,3 +58,4 @@ obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT) += obj-$(CONFIG_LEDS_TRIGGER_GPIO) += ledtrig-gpio.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o diff --git a/target/linux/generic/patches-3.3/941-ocf_20110720.patch b/target/linux/generic/patches-3.3/941-ocf_20110720.patch index 5ff399e..715d4fa 100644 --- a/target/linux/generic/patches-3.3/941-ocf_20110720.patch +++ b/target/linux/generic/patches-3.3/941-ocf_20110720.patch @@ -34,7 +34,7 @@ * All of these routines try to estimate how many bits of randomness a * particular randomness source. They do this by keeping track of the * first and second order deltas of the event timings. -@@ -726,6 +736,63 @@ void add_disk_randomness(struct gendisk +@@ -726,6 +736,63 @@ void add_disk_randomness(struct gendisk } #endif diff --git a/target/linux/generic/patches-3.3/980-update_arm_machtypes.patch b/target/linux/generic/patches-3.3/980-update_arm_machtypes.patch index 391511c..7d49ce9 100644 --- a/target/linux/generic/patches-3.3/980-update_arm_machtypes.patch +++ b/target/linux/generic/patches-3.3/980-update_arm_machtypes.patch @@ -3335,7 +3335,7 @@ pluto MACH_PLUTO PLUTO 3869 acfx100 MACH_ACFX100 ACFX100 3870 msm8625_rumi3 MACH_MSM8625_RUMI3 MSM8625_RUMI3 3871 -@@ -1161,6 +3833,8 @@ valente_wx MACH_VALENTE_WX VALENTE_WX +@@ -1161,6 +3833,8 @@ valente_wx MACH_VALENTE_WX VALENTE_WX huangshans MACH_HUANGSHANS HUANGSHANS 3879 bosphorus1 MACH_BOSPHORUS1 BOSPHORUS1 3880 prima MACH_PRIMA PRIMA 3881 diff --git a/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch index fb16e2a..a476952 100644 --- a/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch +++ b/target/linux/generic/patches-3.3/992-mpcore_wdt_fix_watchdog_counter_loading.patch @@ -51,7 +51,7 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> +EXPORT_SYMBOL_GPL(twd_timer_get_rate); --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c -@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct +@@ -99,9 +99,7 @@ static void mpcore_wdt_keepalive(struct spin_lock(&wdt_lock); /* Assume prescale is set to 256 */ |