aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-10-27 17:11:06 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-10-27 17:11:06 +0000
commit4f3acd22a425dab96caf97dc9ae6b3ab36617530 (patch)
treef76190c722fd0c1d868276ad2f661b179a92749a /target
parentbb2a90b763d4a81eaf09fc906f0d205c4d60d0f7 (diff)
downloadupstream-4f3acd22a425dab96caf97dc9ae6b3ab36617530.tar.gz
upstream-4f3acd22a425dab96caf97dc9ae6b3ab36617530.tar.bz2
upstream-4f3acd22a425dab96caf97dc9ae6b3ab36617530.zip
ar71xx: ag71xx: fix build_skb arguments for 3.6
Also add a compatibility patch for 3.3 Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33969 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c2
-rw-r--r--target/linux/ar71xx/patches-3.3/a01-ag71xx-build_skb-compat.patch12
2 files changed, 13 insertions, 1 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index fb99d27281..1564504486 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -891,7 +891,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
dev->stats.rx_packets++;
dev->stats.rx_bytes += pktlen;
- skb = build_skb(ring->buf[i].rx_buf);
+ skb = build_skb(ring->buf[i].rx_buf, 0);
if (!skb) {
kfree(ring->buf[i].rx_buf);
goto next;
diff --git a/target/linux/ar71xx/patches-3.3/a01-ag71xx-build_skb-compat.patch b/target/linux/ar71xx/patches-3.3/a01-ag71xx-build_skb-compat.patch
new file mode 100644
index 0000000000..a75f8ef4c2
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.3/a01-ag71xx-build_skb-compat.patch
@@ -0,0 +1,12 @@
+reverted:
+--- a/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
++++ b/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+@@ -891,7 +891,7 @@ static int ag71xx_rx_packets(struct ag71
+ dev->stats.rx_packets++;
+ dev->stats.rx_bytes += pktlen;
+
+- skb = build_skb(ring->buf[i].rx_buf, 0);
++ skb = build_skb(ring->buf[i].rx_buf);
+ if (!skb) {
+ kfree(ring->buf[i].rx_buf);
+ goto next;