aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-01-04 18:25:05 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-01-04 18:25:05 +0000
commit70bc9601ba67b6f1f400f796e45b83d46f1a0709 (patch)
treebd96f2cfeacf850b1fed4b48bc19d2cdb8f08a64 /target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch
parent0a03f4646f3eec5eef4f81adb7f9ba3b7951f45f (diff)
downloadmaster-187ad058-70bc9601ba67b6f1f400f796e45b83d46f1a0709.tar.gz
master-187ad058-70bc9601ba67b6f1f400f796e45b83d46f1a0709.tar.bz2
master-187ad058-70bc9601ba67b6f1f400f796e45b83d46f1a0709.zip
kernel: bgmac: update the driver patches to a version submitted for mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39201 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch')
-rw-r--r--target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch b/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch
index 3b818bec3e..f708e7dcec 100644
--- a/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch
+++ b/target/linux/generic/patches-3.10/775-bgmac-check-length-of-received-frame.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] bgmac: check length of received frame
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -347,6 +347,7 @@ static int bgmac_dma_rx_read(struct bgma
+@@ -349,6 +349,7 @@ static int bgmac_dma_rx_read(struct bgma
struct sk_buff *skb = slot->skb;
struct bgmac_rx_header *rx;
u16 len, flags;
@@ -17,7 +17,7 @@ Subject: [PATCH] bgmac: check length of received frame
/* Unmap buffer to make it accessible to the CPU */
dma_sync_single_for_cpu(dma_dev, slot->dma_addr,
-@@ -355,6 +356,12 @@ static int bgmac_dma_rx_read(struct bgma
+@@ -357,6 +358,12 @@ static int bgmac_dma_rx_read(struct bgma
/* Get info from the header */
rx = (struct bgmac_rx_header *)skb->data;
len = le16_to_cpu(rx->len);
@@ -30,7 +30,7 @@ Subject: [PATCH] bgmac: check length of received frame
flags = le16_to_cpu(rx->flags);
do {
-@@ -362,7 +369,7 @@ static int bgmac_dma_rx_read(struct bgma
+@@ -364,7 +371,7 @@ static int bgmac_dma_rx_read(struct bgma
int err;
/* Check for poison and drop or pass the packet */