diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-05-06 17:08:30 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-05-06 17:08:30 +0000 |
| commit | ee9f3b6a3c1c896d4c037cb21fdb0190aa55c40e (patch) | |
| tree | aa22705e5a4838bff72a5494264b029c95760059 /target/linux/atheros/patches-3.3/200-ar2313_enable_mvswitch.patch | |
| parent | 0f425fe91e649a435ff3a9972e09fe139fceac5f (diff) | |
| download | upstream-ee9f3b6a3c1c896d4c037cb21fdb0190aa55c40e.tar.gz upstream-ee9f3b6a3c1c896d4c037cb21fdb0190aa55c40e.tar.bz2 upstream-ee9f3b6a3c1c896d4c037cb21fdb0190aa55c40e.zip | |
atheros: update to 3.3.4 (based on work by acoul), fix mvswitch driver for newer kernels
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31625 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.3/200-ar2313_enable_mvswitch.patch')
| -rw-r--r-- | target/linux/atheros/patches-3.3/200-ar2313_enable_mvswitch.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/target/linux/atheros/patches-3.3/200-ar2313_enable_mvswitch.patch b/target/linux/atheros/patches-3.3/200-ar2313_enable_mvswitch.patch new file mode 100644 index 0000000000..95a993de28 --- /dev/null +++ b/target/linux/atheros/patches-3.3/200-ar2313_enable_mvswitch.patch @@ -0,0 +1,70 @@ +--- a/drivers/net/ethernet/ar231x/ar231x.c ++++ b/drivers/net/ethernet/ar231x/ar231x.c +@@ -745,6 +745,7 @@ static void ar231x_load_rx_ring(struct n + for (i = 0; i < nr_bufs; i++) { + struct sk_buff *skb; + ar231x_descr_t *rd; ++ int offset = RX_OFFSET; + + if (sp->rx_skb[idx]) + break; +@@ -760,7 +761,9 @@ static void ar231x_load_rx_ring(struct n + * Make sure IP header starts on a fresh cache line. + */ + skb->dev = dev; +- skb_reserve(skb, RX_OFFSET); ++ if (sp->phy_dev) ++ offset += sp->phy_dev->pkt_align; ++ skb_reserve(skb, offset); + sp->rx_skb[idx] = skb; + + rd = (ar231x_descr_t *) & sp->rx_ring[idx]; +@@ -834,20 +837,23 @@ static int ar231x_rx_int(struct net_devi + /* alloc new buffer. */ + skb_new = netdev_alloc_skb(dev, AR2313_BUFSIZE + RX_OFFSET); + if (skb_new != NULL) { ++ int offset; + + skb = sp->rx_skb[idx]; + /* set skb */ + skb_put(skb, + ((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN); +- + dev->stats.rx_bytes += skb->len; +- skb->protocol = eth_type_trans(skb, dev); +- /* pass the packet to upper layers */ +- netif_rx(skb); + ++ /* pass the packet to upper layers */ ++ sp->rx(skb); + skb_new->dev = dev; ++ + /* 16 bit align */ +- skb_reserve(skb_new, RX_OFFSET); ++ offset = RX_OFFSET; ++ if (sp->phy_dev) ++ offset += sp->phy_dev->pkt_align; ++ skb_reserve(skb_new, offset); + /* reset descriptor's curr_addr */ + rxdesc->addr = virt_to_phys(skb_new->data); + +@@ -1258,6 +1264,8 @@ static int ar231x_mdiobus_probe (struct + return PTR_ERR(phydev); + } + ++ sp->rx = phydev->netif_rx; ++ + /* mask with MAC supported features */ + phydev->supported &= (SUPPORTED_10baseT_Half + | SUPPORTED_10baseT_Full +--- a/drivers/net/ethernet/ar231x/ar231x.h ++++ b/drivers/net/ethernet/ar231x/ar231x.h +@@ -222,6 +222,8 @@ typedef struct { + */ + struct ar231x_private { + struct net_device *dev; ++ int (*rx)(struct sk_buff *skb); ++ + int version; + u32 mb[2]; + |