aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-05-06 21:19:14 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-05-06 21:19:14 +0000
commitf20d1938b59d2edb85d5cd6b67176b452e9dff67 (patch)
tree044abda1179e26bc1161e60d5a06a7ff784c9bab /target/linux/ar7
parentc7667e1b888e04d3696dc01d7874ef484ba502f7 (diff)
downloadupstream-f20d1938b59d2edb85d5cd6b67176b452e9dff67.tar.gz
upstream-f20d1938b59d2edb85d5cd6b67176b452e9dff67.tar.bz2
upstream-f20d1938b59d2edb85d5cd6b67176b452e9dff67.zip
kernel: rewrite the phy packet hook, put it in the network stack to avoid having to keep non-upstream ethernet driver changes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31637 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7')
-rw-r--r--target/linux/ar7/patches-3.3/973-cpmac_handle_mvswitch.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/target/linux/ar7/patches-3.3/973-cpmac_handle_mvswitch.patch b/target/linux/ar7/patches-3.3/973-cpmac_handle_mvswitch.patch
deleted file mode 100644
index 9c2ab5057b..0000000000
--- a/target/linux/ar7/patches-3.3/973-cpmac_handle_mvswitch.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/drivers/net/ethernet/ti/cpmac.c
-+++ b/drivers/net/ethernet/ti/cpmac.c
-@@ -373,6 +373,7 @@ static struct sk_buff *cpmac_rx_one(stru
- struct cpmac_desc *desc)
- {
- struct sk_buff *skb, *result = NULL;
-+ int offset;
-
- if (unlikely(netif_msg_hw(priv)))
- cpmac_dump_desc(priv->dev, desc);
-@@ -384,10 +385,15 @@ static struct sk_buff *cpmac_rx_one(stru
- return NULL;
- }
-
-- skb = netdev_alloc_skb_ip_align(priv->dev, CPMAC_SKB_SIZE);
-+ skb = netdev_alloc_skb(priv->dev, CPMAC_SKB_SIZE);
- if (likely(skb)) {
-+ offset = 2;
-+ if (priv->phy) {
-+ offset += priv->phy->pkt_align;
-+ }
-+ skb_reserve(skb, offset);
-+
- skb_put(desc->skb, desc->datalen);
-- desc->skb->protocol = eth_type_trans(desc->skb, priv->dev);
- skb_checksum_none_assert(desc->skb);
- priv->dev->stats.rx_packets++;
- priv->dev->stats.rx_bytes += desc->datalen;
-@@ -459,7 +465,12 @@ static int cpmac_poll(struct napi_struct
-
- skb = cpmac_rx_one(priv, desc);
- if (likely(skb)) {
-- netif_receive_skb(skb);
-+ if (priv->phy->netif_receive_skb) {
-+ priv->phy->netif_receive_skb(skb);
-+ } else {
-+ skb->protocol = eth_type_trans(skb, priv->dev);
-+ netif_receive_skb(skb);
-+ }
- received++;
- }
- desc = desc->next;
-@@ -952,7 +963,7 @@ static void cpmac_adjust_link(struct net
-
- static int cpmac_open(struct net_device *dev)
- {
-- int i, size, res;
-+ int i, size, res, offset;
- struct cpmac_priv *priv = netdev_priv(dev);
- struct resource *mem;
- struct cpmac_desc *desc;
-@@ -991,11 +1002,17 @@ static int cpmac_open(struct net_device
-
- priv->rx_head = &priv->desc_ring[CPMAC_QUEUES];
- for (i = 0, desc = priv->rx_head; i < priv->ring_size; i++, desc++) {
-- skb = netdev_alloc_skb_ip_align(dev, CPMAC_SKB_SIZE);
-+ skb = netdev_alloc_skb(dev, CPMAC_SKB_SIZE);
- if (unlikely(!skb)) {
- res = -ENOMEM;
- goto fail_desc;
- }
-+ offset = 2;
-+ if (priv->phy) {
-+ offset += priv->phy->pkt_align;
-+ }
-+ skb_reserve(skb, offset);
-+
- desc->skb = skb;
- desc->data_mapping = dma_map_single(&dev->dev, skb->data,
- CPMAC_SKB_SIZE,